Index: /applications/editors/josm/i18n/convplugins.pl
===================================================================
--- /applications/editors/josm/i18n/convplugins.pl	(revision 14843)
+++ /applications/editors/josm/i18n/convplugins.pl	(revision 14844)
@@ -25,5 +25,5 @@
       {
         $printed = 1;
-        print "/* Plugin $plugin */\ntr(\"$1\");\n";
+        print "/* Plugin $plugin */\ntr(\"$1\");\n" if($plugin ne "myPluginName");
       }
       elsif($line =~ /project name=\"(.*?)\"/)
Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/ar.po	(revision 14844)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-30 18:05+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-27 21:35+0000\n"
 "Last-Translator: metehyi <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,9 +17,9 @@
 "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-03-31 14:52+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "جاري إنشاء واجهة المستخجم الرسومية الرئيسية"
@@ -37,38 +37,38 @@
 msgstr "لم أتمكن من قراءة الإسقاط من التفضيلات. إستعمال EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
-msgstr "تغييرات غير محفوظة"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+msgstr "التغييرات غير المحفوظة"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
-msgstr "يوجد تغييرات غير محفوظة. إلغاء التغييرات و المتابعة ؟"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+msgstr "يوجد تغييرات غير محفوظة. تجاهل التغييرات و المتابعة ؟"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
-msgstr "إحفظ ثم أخرج"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+msgstr "حفظ و خروج"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
-msgstr "إلغاء ثم الخروج"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+msgstr "تجاهل و خروج"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -79,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -93,4 +93,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -100,10 +101,10 @@
 msgstr "إلغاء"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "تجاهل URL سيئة التكوين: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -129,12 +130,12 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
-msgstr "محرّر Java OpenStreetMap"
+msgstr "محرر جافا خريطة الطريق المفتوحة"
 
 #. Add the version number
@@ -153,5 +154,5 @@
 #, java-format
 msgid "Java Version {0}"
-msgstr "إصدار Java {0}"
+msgstr "إصدارجافا {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
@@ -179,5 +180,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
 msgid "Revision"
-msgstr "المراجعة"
+msgstr "مراجعة"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
@@ -189,5 +190,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
 msgid "Plugins"
-msgstr ""
+msgstr "إضافات"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
@@ -197,5 +198,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:190
 msgid "File could not be found."
-msgstr "لم أتمكن من العثور على الملف."
+msgstr "لا يمكن العثور عن الملف"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
@@ -260,5 +261,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 msgid "Move the selected nodes into a circle."
-msgstr "حرّك العقد المحددة إلى مستديرة"
+msgstr "حرّك العقد المحددة إلى الحلقة"
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
@@ -271,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -307,5 +308,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 msgid "Move the selected nodes in to a line."
-msgstr "حرك العقد المختارة إلى خط مستقيم."
+msgstr "حرك العقد المختارة إلى خط"
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59
@@ -339,5 +340,5 @@
 #, java-format
 msgid "Zoom to {0}"
-msgstr "كبّر/صغر لحد {0}"
+msgstr "زوم الى {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
@@ -360,5 +361,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:81
 msgid "No conflicts to zoom to"
-msgstr "لا يوجد تناقضات للتكبير عليها"
+msgstr "لا  تناقضات للتكبير عليها"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
@@ -369,9 +370,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
-msgstr "ادمج عدة طرقات في طريق واحدة."
+msgstr "ادمج عدة طرق في طريق واحدة."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67
 msgid "Please select at least two ways to combine."
-msgstr "الرجاء إختر على الأقل طريقين للدمج."
+msgstr "الرجاء إختر على الأقل طريقتين للدمج."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112
@@ -397,13 +398,12 @@
 "The ways can not be combined in their current directions.  Do you want to "
 "reverse some of them?"
-msgstr ""
-"لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات البعض منها ؟"
+msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
 msgid "Reverse and Combine"
-msgstr "أعكس الإتجاهات ثم إدمج"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+msgstr "أعكس  ثم إدمج"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -411,37 +411,37 @@
 msgstr "ادخل القيم لكل التناقضات."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "حلل التناقضات"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "ادمج {0} طرقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "كل الطرقات كانت فارغة"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
 "nodes)"
-msgstr ""
+msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36
 msgid "Copy"
-msgstr "إنسَخ"
+msgstr "نسخ"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
 msgid "Copy selected objects to paste buffer."
-msgstr "أنسخ الأغراض المختارة إلى وسيط الإلصاق."
+msgstr "نسخ الكائنات  المختارة الى وسيط الصق"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:133
 msgid "Please select something to copy."
-msgstr "الرجاء إختيار شيء ما للنسخ."
+msgstr "الرجاء إختيار شيء للنسخ."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
@@ -449,9 +449,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:182
 msgid "Create Circle"
-msgstr "كوّن مستديرة"
+msgstr "إنشاء حلقة"
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:37
 msgid "Create a circle from three selected nodes."
-msgstr "كوّن مستديرة من العقد المختارة."
+msgstr "كوّن مستديرة من ثلاث عقد مختارة."
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
@@ -479,5 +479,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:80
 msgid "Delete"
-msgstr "إحذف"
+msgstr "أحذف"
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
@@ -512,9 +512,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download from OSM..."
-msgstr "نزّل من أو.أس.أم"
+msgstr "نزّل من أو.أس.أم ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download map data from the OSM server."
-msgstr "نزّل معطيات خريطة من الخادم OSM."
+msgstr "نزّل معطيات خريطة من الخادم أو.أس.أم"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
@@ -524,5 +524,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -562,5 +562,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
 msgid "OSM Server Files"
-msgstr "ملفات الخادم OSM"
+msgstr "ملفات الخادم أو.أس.أم"
 
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
@@ -597,5 +597,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85
 msgid "Add author information"
-msgstr "لا يوجد معلومات عن المؤلف"
+msgstr "أضف معلومات عن المؤلف"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
@@ -617,5 +617,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102
 msgid "Copyright year"
-msgstr "سنة حقوق المؤلف"
+msgstr "تاريخ حقوق المؤلف"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:110
@@ -641,6 +641,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -649,6 +649,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -662,5 +662,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
 msgid "JOSM Online Help"
-msgstr "المساعدة على الخط لِــJOSM"
+msgstr "المساعدة على الخط لِـ ج.أو.أس.أم"
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:88
@@ -773,9 +773,9 @@
 msgstr "ادمجعلى كلّ حال"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1047,5 +1047,5 @@
 msgstr "إحفظ المعطيات الحالية."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1053,26 +1053,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "مستند فارغ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "لا يحتوي المستند على أي معطيات."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "رغم ذلك احفظه"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "التناقضات"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1080,32 +1080,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "إحفظ ملف GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
-msgstr "إحفظ ملف OSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+msgstr "إحفظ ملف أو.أس.أم"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "إمتداد ملف غير معروف."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "حصل خطأ عند الحفظ."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1159,18 +1159,18 @@
 msgstr "اغلق"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1182,5 +1182,5 @@
 msgstr[5] "إنّ العقد المختارة ليست موجودة في وسط أي طريق."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1192,9 +1192,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "إنّ العقد المختارة لا تتقاسم نفس الطريق."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1202,10 +1202,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1213,5 +1213,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1219,5 +1219,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1363,46 +1363,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
-msgstr "حمّل إلى OSM...."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+msgstr "حمّل إلى أو.أس.أم ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
-msgstr "حمّل كل التغييرات إلى الخادم OSM."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "الأغراض اللتي يجب إضافتها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "الأغراض اللتي يجب تغييرها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "الأغراض اللتي يجب حذفها:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "حمّل هذه التغييرات :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "حمّل التغييرات"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "يوجد تناقضات غير محلولة. يجب عليك حلّ هذه التناقضات أولاً."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "لا يوجد تغييرات للتحميل."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "جاري تحميل التغييرات"
@@ -1411,5 +1415,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
 msgid "Zoom In"
-msgstr "كبّر"
+msgstr "كبّر الرؤية"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
@@ -1506,5 +1510,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:44
 msgid "Downloading data"
-msgstr "جاري تحميل معطيات"
+msgstr "جاري تحميل المعطيات"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
@@ -1585,31 +1589,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "أضافة عقدة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "إضافة عقدة إلى طريق"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "إضافة عقدة جديدة إلى طريق موجودة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "انشئ عقدة جديدة"
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "إختر العقدة الموجودة تحت المزلاق."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1618,9 +1624,4 @@
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "إختر العقدة الموجودة تحت المزلاق."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2025,5 +2026,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2224,5 +2225,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "خط سكة حديد"
@@ -2248,127 +2249,127 @@
 msgstr[5] "{0} عقد"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "عضو فارغ في العلاقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "أمحي العضو ''{0}'' في العلاقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "للطريق ''{0}'' أقل من نقطتين."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "دور غير معروف ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "نوع عضو غير معروف لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "لم أجد طريق \"من\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "لم أجد طريق \"إلى\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "الطريق الداخلية ''{0}''موجودة في الخارج."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "النص"
@@ -2376,5 +2377,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2406,5 +2407,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "الخلفية"
@@ -2461,5 +2462,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2473,5 +2474,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2501,14 +2502,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "أخبار اليوم غير متوفرة"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "جاري تنزيل \"أخبار اليوم\""
@@ -2535,5 +2536,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 msgid "OSM Password."
-msgstr "كلمة المرور OSM."
+msgstr "كلمة المرور أو.أس.أم."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
@@ -2574,71 +2575,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "إسم المستخدم"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "كلمة‌المرور"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "الإستعمال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "الخيارات"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "أعرض هذه المساعدة"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
+msgid "Standard unix geometry argument"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+msgid "Download the bounding box"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
-msgid "Standard unix geometry argument"
+msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
-msgid "Download the bounding box"
+msgid "Download the bounding box as raw gps"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgid "Select with the given search"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
-msgid "Open file (as raw gps, if .gpx)"
+msgid "Launch in maximized mode"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
-msgid "Download the bounding box as raw gps"
+msgid "Reset the preferences to default"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
-msgid "Select with the given search"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
-msgid "Launch in maximized mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-msgid "Reset the preferences to default"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Set the language."
 msgstr "عيّن اللغة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "أمثال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2646,22 +2647,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+msgid "Activating updated plugins"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
-msgid "Activating updated plugins"
+msgid "Loading early plugins"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
-msgid "Loading early plugins"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
@@ -2787,5 +2793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
 msgid "Contacting the OSM server..."
-msgstr "جاري الإتصال بلخادم OSM..."
+msgstr "جاري الإتصال بلخادم أو.أس.أم ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:104
@@ -2840,5 +2846,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3047,5 +3053,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "الدّور"
@@ -3093,73 +3099,71 @@
 msgstr "الخصائص/ العضويات"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "طبّق التغيرات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "أنشا علاقة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "حرّر العلاقة الجديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "حرّر العلاقة رقم {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "الأساسي"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "المشغول من"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "الأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "حرّك إلى الأعلى"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "أضف الإختيار"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "أزل المختارة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "إنزع كلّ الأغراض المختارة حالياً من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "حرّك إلى الأسفل"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3168,36 +3172,36 @@
 msgstr "أزِل"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "أزل العضو في سطر الجدول الحالي من هذه العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "نزّل الأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "الأعضاء: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "محرّر العلاقات: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "حصل تعارض حين الإستيراد."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "خطأ عند التحليل النحوي لردّ المخدم."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "غير قادر على الإتصال بلمخدم."
@@ -3211,10 +3215,11 @@
 msgstr "أمحي العلاقة المحددة"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "العلاقات"
@@ -3407,5 +3412,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "الأماكن"
@@ -3452,21 +3457,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "النوع"
@@ -3517,10 +3522,7 @@
 msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة"
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "الخريطة"
@@ -3678,4 +3680,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3781,5 +3784,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3793,5 +3796,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:803
 msgid "Download from OSM along this track"
-msgstr "نزّل من OSM على طول هذا المسلك"
+msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
@@ -3836,19 +3839,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "خارج عن المنطقة المنزلة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "الإصدار {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} يتألف من:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} ممحي.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "الإستعمال"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "الإصدار {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3856,21 +3874,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4306,5 +4324,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4389,4 +4407,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4470,7 +4490,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4483,7 +4500,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4499,10 +4523,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4671,5 +4695,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4703,7 +4729,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4787,4 +4813,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4837,4 +4871,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4843,7 +4883,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4852,15 +4889,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4885,129 +4911,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "الإسم"
@@ -5042,5 +5070,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:217
 msgid "Colors used by different objects in JOSM."
-msgstr "الألوان المستعملة في الأغراض المختلفة في JOSM."
+msgstr "الألوان المستعملة في الأغراض المختلفة في ج.أو.أس.أم."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:232
@@ -5056,12 +5084,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "محلة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "ملاحظات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5088,45 +5114,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "السيارة"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "الدراجة"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5134,25 +5150,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "المشي"
@@ -5200,7 +5221,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "أرسم خطوط بين نقاط جهاز نظام تحديد المواقع العالمي."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5303,5 +5323,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "OSM Data"
-msgstr "المعطيات OSM"
+msgstr "المعطيات أو.أس.أم"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/FilePreferences.java:21
@@ -5400,5 +5420,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
 msgid "Connection Settings for the OSM server."
-msgstr ""
+msgstr "تعيينات الإتصال للخادم أو.أس.أم."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
@@ -5421,4 +5441,5 @@
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
+"يجب عليك إعادة بدء تشغيل ج.أو.أس.أم كي تُأخذ بعض التغييرات بعين الإعتبار."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:44
@@ -5468,10 +5489,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
 msgid "Login name (email) to the OSM account."
-msgstr "إسم الدخول (البريد الإلكتروني) للحساب OSM."
+msgstr "إسم الدخول (البريد الإلكتروني) للحساب أو.أس.أم."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
-msgstr "كلمة المرور للحساب OSM. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
+msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
@@ -5481,9 +5502,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
 msgid "OSM username (email)"
-msgstr "الإسم لدى OSM (البريد الإلكتروني)"
+msgstr "الإسم لدى أو.أس.أم (البريد الإلكتروني)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
 msgid "OSM password"
-msgstr "كلمة المرور OSM"
+msgstr "كلمة المرور أو.أس.أم"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
@@ -5774,5 +5795,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
 msgid "Apply Preset"
-msgstr "ضبّق الخيار المسبق"
+msgstr "طبّق الخيار المسبق"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:682
@@ -5789,5 +5810,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:39
 msgid "Contacting OSM Server..."
-msgstr "جاري الإتصال بلخادم OSM"
+msgstr "جاري الإتصال بلخادم أو.أس.أم"
 
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
@@ -5800,13 +5821,13 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:50
 msgid "Downloading OSM data..."
-msgstr "جاري تنزيل معطيات OSM"
+msgstr "جاري تنزيل معطيات أو.أس.أم"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "جاري تحضير المعطيات..."
@@ -5816,25 +5837,75 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "لا يوجد تغييرات للتحميل."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "اعداد..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "جاري الإرسال..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "خطأ عند التحليل النحوي لردّ المخدم."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "مضيف غير معروف"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "الإسم أو كلمة المرور خطأ"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "تحذير: يتم نقل كلمة المرور بدون تعتيم"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "أدخل كلمة المرور"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "دخول"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5845,44 +5916,52 @@
 msgstr "خطأ تحليل نحوي"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "نسخة مجهولة"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "نسخة مجهولة"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "لا يوجد لــ <nd>  أي مرجع"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "غرض غير مسموح به معروف بــ id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
-msgstr "حضّر المعطيات OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+msgstr "حضّر المعطيات أو.أس.أم ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "ضذوذ تكوين معرف العقدة"
@@ -5892,10 +5971,10 @@
 msgstr "جاري الإتصال بلخادم"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
-msgstr "إستحالة الإتصال بلخادم osm. الرجاء فحص إتصالات الإنترنت."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+msgstr "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5903,55 +5982,8 @@
 msgstr "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "أودع الملاحظات"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} باقية. متابعة الإرسال لِــ {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "وقع خطأ: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "مضيف غير معروف"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "اعداد..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "جاري الإرسال..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "إجهاض عملية النقل لسبب خطأ ( سأنتظر 5 ثواني ):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6106,6 +6138,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "مجهول"
@@ -6209,5 +6241,5 @@
 "This is always a coding error. If you are running the latest\n"
 "version of JOSM, please consider being kind and file a bug report."
-msgstr "حصل شذوذ غير متوقع."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
@@ -6272,7 +6304,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "أنشئ مساحات"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6291,7 +6322,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "أنشئ مساحات"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6315,5 +6345,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr ""
@@ -6373,5 +6403,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:343
 msgid "No username provided."
-msgstr ""
+msgstr "لم يتم إعطاء إسم للمؤلف"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
@@ -7547,9 +7577,9 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
-msgstr ""
+msgstr "الماء"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
@@ -7840,5 +7870,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -7855,4 +7885,11 @@
 msgstr "التحذير"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "وقع خطأ: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7878,35 +7915,38 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "أضف تعليق"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "ادخل تعليقك"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "اغلق فعلاً ؟"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "أوصف المشكلة بدقة"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr ""
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -7935,5 +7975,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -7941,9 +7981,9 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr ""
@@ -8011,83 +8051,67 @@
 msgstr ""
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr ""
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
-#, fuzzy
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 msgid "Routing"
-msgstr "أطلال"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-msgid "Click to add route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-msgid "Click and drag to move route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "أزل المختارة"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
+msgid "Click to add destination."
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "إفتح لائحة بكل العلاقات."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "محطة"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+msgid "Add routing layer"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "متوسط"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "أحذية"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "أسرع"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "أعكس إتجاه الطرقات"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "طريق"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "تفضيلات إختصارات لوحة المفاتيح"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "تفضيلات إختصارات لوحة المفاتيح"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "من النوع طريق"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
@@ -8096,7 +8120,6 @@
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "إلى اليمين"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8104,33 +8127,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr ""
@@ -8153,34 +8176,34 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr ""
@@ -8195,5 +8218,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8248,7 +8271,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "حرّر دولة/ولاية"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8263,7 +8285,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "عقدة"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
@@ -8272,9 +8293,8 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "متعدد"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8282,10 +8302,6 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -8293,36 +8309,27 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "طريق"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "جدول نهر"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "إبحث"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "الملفّ"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "السيارة"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8406,5 +8413,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "إسم الشارع"
@@ -8416,5 +8423,5 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
 msgid "User"
-msgstr ""
+msgstr "المستخدِم"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:77
@@ -8433,9 +8440,9 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112
 msgid "Select User's Data"
-msgstr "إختر معطيات المستخدم/ين"
+msgstr "إختر معطيات المستخدم"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113
 msgid "Replaces Selection with Users data"
-msgstr ""
+msgstr "يبدل الخيار بمعطيات المستخدمين"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148
@@ -8445,9 +8452,9 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152
 msgid "Please choose a user using the author panel"
-msgstr ""
+msgstr "الرجاء إنتقاء مستخدم بواسطة لوحة المؤلف"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165
 msgid "Sorry, doesn't work with anonymous users"
-msgstr ""
+msgstr "عفواً، لا يعمل للمستخدمين مجهولي الهوية"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
@@ -8506,7 +8513,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "علاقة واحدة"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
@@ -8525,12 +8531,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "دمج التناقضات."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "أمحي من العلاقة"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8539,7 +8543,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "طريق مغلقة الدوران"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
@@ -8548,7 +8551,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "تقاطع طرقات سريعة"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9102,5 +9104,5 @@
 #, java-format
 msgid "sport type {0}"
-msgstr ""
+msgstr "نوع الرياضة {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
@@ -9122,9 +9124,15 @@
 #, java-format
 msgid "waterway type {0}"
-msgstr ""
+msgstr "نوع مجرى الماء {0}"
 
 #. color place
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
 #. </rule>
 #.
@@ -9208,7 +9216,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr ""
@@ -9222,5 +9230,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr ""
@@ -9492,4 +9500,9 @@
 msgstr ""
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9516,7 +9529,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "أنشئ مساحات"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9607,21 +9619,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
-msgstr ""
+msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم."
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9630,15 +9649,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9648,15 +9667,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
-msgstr ""
+msgstr "حمّل ملفات TCX مباشرتاً من ج.أو.أس.أم."
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9665,5 +9684,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9672,5 +9691,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9679,5 +9698,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9767,5 +9786,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr ""
@@ -9820,7 +9839,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr ""
@@ -9863,5 +9882,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -9909,5 +9928,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr ""
@@ -9963,5 +9982,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -10011,5 +10030,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr ""
@@ -10056,5 +10075,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr ""
@@ -10101,5 +10120,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr ""
@@ -10257,6 +10276,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr ""
@@ -10305,5 +10324,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr ""
@@ -10335,5 +10354,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr ""
@@ -10344,5 +10363,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr ""
@@ -10356,5 +10375,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr ""
@@ -10506,5 +10525,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10525,6 +10544,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr ""
@@ -10668,7 +10687,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr ""
@@ -10682,73 +10701,63 @@
 msgstr ""
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr ""
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "الدراجة النارية"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr ""
@@ -10780,5 +10789,5 @@
 #: build/trans_presets.java:322
 msgid "Max. Height (meters)"
-msgstr ""
+msgstr "الإرتفاع الأقصى (أمتار)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
@@ -10823,130 +10832,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "النوع"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10954,5 +10851,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10960,11 +10857,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10972,5 +10863,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10978,5 +10869,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10984,5 +10875,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10990,6 +10881,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11008,6 +10905,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr ""
@@ -11033,6 +10930,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr ""
@@ -11058,6 +10955,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr ""
@@ -11083,6 +10980,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr ""
@@ -11096,5 +10993,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr ""
@@ -11112,5 +11009,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr ""
@@ -11128,5 +11025,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr ""
@@ -11153,6 +11050,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr ""
@@ -11193,6 +11090,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11203,5 +11099,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr ""
@@ -11545,14 +11441,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -11577,20 +11473,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "إشارات_السير"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "جزيرة"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11598,5 +11494,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11605,5 +11501,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11613,5 +11509,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11634,5 +11530,5 @@
 #: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "toucan"
-msgstr ""
+msgstr "طير الطوقان"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
@@ -11687,5 +11583,5 @@
 #: build/trans_presets.java:780
 msgid "clockwise"
-msgstr "عقارب الساعة"
+msgstr "إتجاه عقارب الساعة"
 
 #: build/trans_presets.java:782
@@ -11760,10 +11656,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -11776,29 +11673,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr ""
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11807,7 +11693,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11816,154 +11705,95 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "السير المسموح:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr ""
-
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr ""
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr ""
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr ""
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr ""
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr ""
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr ""
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
-msgid "Sally Port"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:946
-msgid "Edit Sally Port"
-msgstr ""
-
-#. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:842
 msgid "Cycle Barrier"
 msgstr "حاجز دراجة"
 
 #. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr ""
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr ""
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "مراقبة الحدود"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "حرّر مراقبة الحدود"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
 msgid "Hedge"
 msgstr ""
@@ -11972,5 +11802,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
+#: build/trans_presets.java:905
 msgid "Fence"
 msgstr ""
@@ -11979,24 +11809,18 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
+#: build/trans_presets.java:909
 msgid "Wall"
-msgstr ""
+msgstr "حائط/جدار"
 
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
+#: build/trans_presets.java:912
 msgid "City Wall"
-msgstr ""
+msgstr "حائط/جدار مدينة"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
+#: build/trans_presets.java:916
 msgid "Retaining Wall"
 msgstr ""
@@ -12005,46 +11829,99 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
 #. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr ""
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr ""
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr ""
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr ""
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "مراقبة الحدود"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "حرّر مراقبة الحدود"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr ""
-
-#. item "Barriers/Entrance" check "Motorcar"
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
+msgid "Sally Port"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1004
+msgid "Edit Sally Port"
+msgstr ""
+
+#. item "Barriers/Sally Port" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
-msgstr ""
+msgstr "الماء"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "نبع"
@@ -12052,5 +11929,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "حرّر نبع"
@@ -12058,5 +11935,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "مسرب"
@@ -12064,10 +11941,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "حرّر مسرب"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "جدول نهر"
@@ -12075,10 +11952,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "حرّر جدول نهر"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "قناة"
@@ -12086,12 +11963,12 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "حرّر قناة"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
-msgstr ""
+msgstr "نهر"
 
 #. item
@@ -12099,5 +11976,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "نهر"
@@ -12105,15 +11982,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
-msgstr "حرّر مياه"
+msgstr "حرّر الماء"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "الأرض اليابسة"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "حرّر الأرض اليابسة"
@@ -12121,15 +11998,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "حوض"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "حرّر حوض"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "خزان"
@@ -12137,15 +12014,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "حرّر خزان"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "خزان مغطى"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "حرّر خزان مغطى"
@@ -12153,5 +12030,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "ضفة نهر"
@@ -12160,10 +12037,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "حرّر ضفة نهر"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "أراضي رطبة"
@@ -12174,56 +12051,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "حرّ أراضي رطبة"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "مستنقع"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr ""
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "شجر إستوائي"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "وحل"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "حرّر وحل"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "شاطئ بحر"
@@ -12231,20 +12108,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "حرّر شاطئ بحر"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "خليج"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "حرّر خليج"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "منحدر صخري"
@@ -12252,10 +12129,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "حرّر منحدر صخري"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "شاطئ"
@@ -12263,5 +12140,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "حرّر شاطئ"
@@ -12269,5 +12146,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr ""
@@ -12275,5 +12152,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr ""
@@ -12282,5 +12159,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "حوض سفن"
@@ -12288,10 +12165,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "حرّر حوض سفن"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "مرسى"
@@ -12299,5 +12176,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "حرّر مرسى"
@@ -12305,5 +12182,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "سدّ"
@@ -12311,15 +12188,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "حرّر سدّ"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
-msgstr ""
+msgstr "نقطة مجرى ماء"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr ""
@@ -12328,26 +12205,26 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
-msgstr ""
+msgstr "سدّ (صغير)"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
-msgstr ""
+msgstr "سدّ (صغير)"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "شلال ماء"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "حرّر شلال ماء"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr ""
@@ -12356,15 +12233,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "مارينا"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "حرّر مارينا"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "رصيف ميناء"
@@ -12372,10 +12249,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "حرّر رصيف ميناء"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr ""
@@ -12383,10 +12260,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr ""
@@ -12396,5 +12273,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr ""
@@ -12402,10 +12279,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "سكة حديدية"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "سكة"
@@ -12413,5 +12290,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "حرّر سكة"
@@ -12441,8 +12318,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr ""
@@ -12456,35 +12333,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "قطار ذات سكة حديد واحدة"
@@ -12492,45 +12369,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "حرّر قطار ذات سكة حديد واحدة"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "قطار نفقي"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "حرّر قطار نفقي"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "ترام"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "حرّر ترام"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr ""
@@ -12538,5 +12415,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -12545,14 +12422,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "سكة حديد غير مستعملة"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "حرّر سكة حديد غير مستعملة"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "سكة حديد مهجورة"
@@ -12561,5 +12438,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr ""
@@ -12568,5 +12445,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr ""
@@ -12576,5 +12453,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12582,5 +12459,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr ""
@@ -12589,10 +12466,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "مصعد كرسي"
@@ -12600,46 +12477,59 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "حرّر مصعد كرسي"
 
 #. item "Aerialway/Chair Lift" text "Name"
+#: build/trans_presets.java:1320
+msgid "Drag Lift"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
+#: build/trans_presets.java:1322
+msgid "Edit Drag Lift"
+msgstr ""
+
+#. item "Aerialway/Drag Lift" text "Name"
+#: build/trans_presets.java:1326
+msgid "Cable Car"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
+#: build/trans_presets.java:1328
+msgid "Edit Cable Car"
+msgstr ""
+
+#. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #: build/trans_presets.java:1334
-msgid "Drag Lift"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
-msgid "Edit Drag Lift"
-msgstr ""
-
-#. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
-msgid "Cable Car"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
-msgid "Edit Cable Car"
-msgstr ""
-
-#. item "Aerialway/Cable Car" text "Name"
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "حرّر قطار ذات سكة حديد واحدة"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "محطة"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "حرّر محطة"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "وقود"
@@ -12649,5 +12539,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "حرّر وقود"
@@ -12663,5 +12553,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12671,5 +12561,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "موقف سيارات"
@@ -12677,40 +12567,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "إستيعاب"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "مساحة"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "متعدد الطوابق"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "تحت الأرض"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
-msgstr "رسم دخول/رسم إستعمال"
+msgstr "رسم دخول/إجرة"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "غسيل سيارات"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "حرّر غسيل سيارات"
@@ -12718,5 +12609,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr ""
@@ -12724,15 +12615,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
-msgstr ""
+msgstr "حرّر متجر سيارات"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "تصليح سيارات"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "حرّر تصليح سيارات"
@@ -12740,5 +12631,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "إستئجار سيارة"
@@ -12747,10 +12638,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "حرّر إستئجار سيارة"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "مشاركة السيارة"
@@ -12758,5 +12649,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "حرّر مشاركة السيارة"
@@ -12764,5 +12655,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "حرّر موقف دراجة"
@@ -12771,5 +12662,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "حرر إستأجار دراجة"
@@ -12778,15 +12669,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "حرر مبيع قطع دراجات"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "النقل المشترك"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr ""
@@ -12794,5 +12685,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "موقف قطار"
@@ -12800,5 +12691,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "حرّر موقف"
@@ -12806,5 +12697,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "موقف ترام"
@@ -12813,5 +12704,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "حرر موقف ترام"
@@ -12819,5 +12710,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "رصيف محطة القطار"
@@ -12826,5 +12717,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "حرّر رصيف محطة القطار"
@@ -12836,5 +12727,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr ""
@@ -12842,10 +12733,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "مساحة"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "مدخل قطار نفقي"
@@ -12854,10 +12745,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "حرّر مدخل قطار نفقي"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -12866,5 +12757,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "محطة حافلة نقل جماعي (باص)"
@@ -12873,5 +12764,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "حرّر محطة حافلة نقل جماعي (باص)"
@@ -12879,5 +12770,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "موقف محطة حافلة نقل جماعي"
@@ -12887,5 +12778,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "حرّر موقفحافلة نقل جماعي (باص)"
@@ -12893,10 +12784,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr ""
@@ -12904,5 +12795,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "تاكسي"
@@ -12910,5 +12801,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "حرّر موقف تاكسي"
@@ -12916,5 +12807,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "مطار"
@@ -12922,15 +12813,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr ""
@@ -12939,5 +12830,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "مكان المبيت"
@@ -12949,5 +12840,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "فندق"
@@ -12956,15 +12847,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "حرّر فندق"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "النجوم"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "فندق (رخيص)"
@@ -12972,20 +12863,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "حرّر فندق (رخيص)"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "بيت ضيافة"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "حرّر بيت ضيافة"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "كوخ"
@@ -12993,10 +12884,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "حرّر كوخ"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "نزل"
@@ -13004,30 +12895,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "حرّر نزل"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "كوخ جبلي"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "حرّر كوخ جبلي"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "موقع قافلة"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "حرّر موقع قافلة"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "موقع تخييم"
@@ -13035,10 +12926,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "حرّر موقع تخييم"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "طعام و شراب"
@@ -13049,5 +12940,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "مطعم"
@@ -13055,5 +12946,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "حرّر مطعم"
@@ -13061,5 +12952,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "الطبخ"
@@ -13067,61 +12958,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "إيطالي"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "صيني"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "معجنات إيطالية (بيزا)"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "هامبرغر"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "يوناني"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "ألماني"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "هندي"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "محلي/إقليمي"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
-msgstr "كباب"
-
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+msgstr "كباب / شورما"
+
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "تركي"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "آسيوي"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "تايلاندي"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "مكسيكي"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "ياباني"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "وجبات سريعة"
@@ -13129,9 +13020,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "حرّر مطعم وجبات السريعة"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "مقهى إستراحة"
@@ -13139,10 +13030,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "حرّر مقهى إستراحة"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "حانة"
@@ -13150,20 +13041,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "حرّر حانة"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "حانة شرب الجعة"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "حرّر حانة شرب الجعة"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "حانة"
@@ -13171,31 +13062,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "حرّر حانة"
 
 #. item "Food+Drinks/Bar" text "Name"
+#: build/trans_presets.java:1616
+msgid "Nightclub"
+msgstr "نادي سهر / نادي ليلي"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
+#: build/trans_presets.java:1618
+msgid "Edit Nightclub"
+msgstr "حرّر نادي سهر/ نادي ليلي"
+
+#. item "Food+Drinks/Nightclub" text "Name"
 #: build/trans_presets.java:1623
-msgid "Nightclub"
-msgstr "نادي سهر"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
-msgid "Edit Nightclub"
-msgstr "حرّر نادي سهر"
-
-#. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
 msgid "Tourism"
 msgstr "سياحة"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr ""
@@ -13204,22 +13095,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "متحف"
@@ -13227,10 +13107,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "حرّر متحف"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "حديقة حيوانات"
@@ -13239,10 +13119,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "حرّر حديقة حيوانات"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "موقع كاشف"
@@ -13250,25 +13130,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr "برج مراقبة"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "أعمال فنية"
@@ -13276,5 +13156,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr "حرّر أعمال فنية"
@@ -13282,77 +13162,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
-msgstr ""
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr "مكتب إستعلامات"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
+msgstr "حرّر مكتب إستعلامات"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
-msgstr ""
+msgstr "نوع الخريطة"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "خريطة"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "خريطة المدينة"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "خريطة راكب دراجة"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
-msgstr ""
+msgstr "لوحة معلومات"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
-msgstr ""
+msgstr "نوع اللوحة"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
-msgstr ""
-
-#: build/trans_presets.java:1693
+msgstr "اللوح"
+
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "التاريخ"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "الطبيعة"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr "الحيوانات الضارة"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "ملجأ"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "حرّر ملجأ"
@@ -13360,25 +13252,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "موقع تنزه"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "حرّر موقع تنزه"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "مواقع تاريخية"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "قلعة"
@@ -13387,20 +13279,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "حرّر قلعة"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "أطلال"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "حرّر أطلال"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "موقع أثري"
@@ -13409,20 +13301,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "حرّر موقع أثري"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "ساحة معركة"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "حرّر ساحة معركة"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "نصب تذكاري"
@@ -13430,56 +13334,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "ساحة معركة"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "حرّر ساحة معركة"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "ملعب"
@@ -13487,15 +13380,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
@@ -13503,15 +13396,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -13525,8 +13418,8 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
-msgstr "إختر الرياضة"
+msgstr "إختر الرياضة :"
 
 #. item "Sport Facilities/Stadium" label "select sport:"
@@ -13603,4 +13496,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -13892,30 +13793,31 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
-msgstr ""
+msgstr "الرياضة"
 
 #. item "Sport Facilities/Stadium" combo "sport"
@@ -13923,227 +13825,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "متعدد"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "أسلحة الرماية"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
-msgstr "مضرب الكرة"
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "كرة المضرب"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "كرة السلّة"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "التسلق"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "ركوب الدراجة"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "سبق الكلاب"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "ركوب الخيل"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "الجمباز"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "سبق الخيل"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "رياضة المحركات"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "التزلج"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "كرة القدم"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "السباحة"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
-msgstr ""
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "تنس الطاولة"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
-msgstr ""
-
-#: build/trans_presets.java:1792
+msgstr "التنس"
+
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "رياضة"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "متعدد"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr ""
@@ -14182,191 +14084,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
-msgstr ""
-
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+msgstr "مركز/نادي رياضي"
+
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "ركب الدراجة"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "رياضة المحركات"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "حرّر رياضة المحركات"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "تزلّج"
@@ -14374,56 +14276,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "نزولاً"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "شمالي"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "مبتدئ"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "سهل"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "متوسط"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "متقدم"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "خبير"
 
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "رماية"
@@ -14431,178 +14335,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "كرة القدم"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "حرّر كرة القدم"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:1967
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
 #: build/trans_presets.java:1970
-msgid "Edit Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf" combo "type"
+msgid "golf_course"
+msgstr ""
+
+#: build/trans_presets.java:1972
+msgid "Boule"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1973
-msgid "golf_course"
-msgstr ""
-
-#: build/trans_presets.java:1975
-msgid "Boule"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1976
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2030
+msgstr "تنس الطاولة"
+
+#. item
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
-msgstr ""
-
-#: build/trans_presets.java:2035
+msgstr "حرّر تنس الطاولة"
+
+#: build/trans_presets.java:2032
 msgid "Tennis"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2036
+msgstr "تنس"
+
+#. item
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
-msgstr ""
+msgstr "حرّر تنس"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "مباني"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "مبنى"
@@ -14610,5 +14514,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -14616,10 +14520,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -14627,10 +14531,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "سفارة"
@@ -14638,10 +14542,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "محكمة"
@@ -14650,10 +14554,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "سجن"
@@ -14662,10 +14566,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "شرطة"
@@ -14675,22 +14579,22 @@
 #. 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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
-msgstr "إطفائية"
+msgstr "فوج إطفاء"
 
 #. item
 #. <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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
-msgstr "حرّر إطفائية"
+msgstr "حرّر فوج إطفاء"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -14698,5 +14602,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -14704,15 +14608,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "مدرسة"
@@ -14720,10 +14624,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "جامعة"
@@ -14731,10 +14635,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "كلّية"
@@ -14742,5 +14646,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -14748,5 +14652,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "سينما"
@@ -14755,10 +14659,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "مكتبة"
@@ -14767,10 +14671,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -14778,10 +14682,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "مسرح"
@@ -14790,10 +14694,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "معبد"
@@ -14803,5 +14707,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -14810,6 +14714,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "الديانة"
@@ -14818,149 +14722,150 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
+msgstr "إيطالي"
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
-msgstr ""
+msgstr "الطقوس الدينية"
 
 #. item "Buildings/Place of Worship" combo "Denomination"
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "سنّي"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "عناوين"
@@ -14969,5 +14874,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -14975,5 +14880,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "رقم المنزل"
@@ -14981,20 +14886,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "رمز البلد"
@@ -15002,5 +14907,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -15009,5 +14914,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -15015,67 +14920,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "مفرد"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "الكلّ"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "المصانع"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "برج"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
-msgstr "خزان/برج مياه"
-
-#. item
-#: build/trans_presets.java:2197
+msgstr "خزان / برج مياه"
+
+#. item
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "منارة"
@@ -15083,10 +14992,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -15094,10 +15003,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -15105,12 +15014,12 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
-msgstr "محطة تكرير مياه"
+msgstr "محطّة تكرير مياه"
 
 #. item
@@ -15118,10 +15027,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
-msgstr "حرّر محطة تكرير مياه"
+msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "ونش"
@@ -15129,21 +15038,21 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "حرّر ونش"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
-msgstr ""
+msgstr "عمود إضائة"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -15151,10 +15060,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -15162,5 +15071,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
@@ -15168,5 +15077,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -15176,39 +15085,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "غاز"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -15217,10 +15126,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -15229,5 +15138,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -15235,10 +15144,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -15249,5 +15158,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
@@ -15255,5 +15164,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -15262,25 +15171,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "التوتر"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "عدد الأسلاك"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
-msgstr ""
+msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "مراحيض"
@@ -15288,25 +15197,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "الرقم المرجعي"
 
-#. item "Amenities/Toilets" text "Reference number"
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
+msgid "Note"
+msgstr "الملاحظة"
+
+#. item "Amenities/Toilets" text "Note"
 #: build/trans_presets.java:2307
-msgid "Charge"
-msgstr ""
-
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
-msgid "Note"
-msgstr ""
-
-#. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "هاتف"
@@ -15315,5 +15219,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -15321,17 +15225,17 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
-msgstr ""
+msgstr "عملات معدنية"
 
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
-msgstr "ملاحظات"
+msgstr "الملاحظات"
 
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -15339,5 +15243,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr ""
@@ -15345,15 +15249,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -15362,5 +15266,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -15368,35 +15272,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr ""
@@ -15405,20 +15309,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:2342
+msgid "Edit Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand" check "Shelter"
 #: build/trans_presets.java:2345
-msgid "Edit Hunting Stand"
-msgstr ""
-
-#. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
 msgid "Hide"
-msgstr ""
+msgstr "مخبئ"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr ""
@@ -15426,22 +15330,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
-msgstr ""
+msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
-msgstr ""
-
-#: build/trans_presets.java:2350
+msgstr "منخفض"
+
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "نافورة"
@@ -15450,10 +15354,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -15462,10 +15366,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr ""
@@ -15473,25 +15377,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr ""
@@ -15499,10 +15403,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "كشك"
@@ -15510,10 +15414,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -15521,5 +15425,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr ""
@@ -15527,88 +15431,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "جزار"
@@ -15616,10 +15520,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "حرّر جزار"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "خباز"
@@ -15627,10 +15531,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "حرّر خباز"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -15638,70 +15542,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "مأكولات عضوية"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "حرّر مبيع مأكولات عضوية"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "مدرسة"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "حرّر أحذية"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "مشروبات"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "حرّر مشروبات"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "حاسوب"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr ""
@@ -15709,10 +15627,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -15720,10 +15638,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "حرّر مخزن خردوات/أدوات منزلية"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -15731,60 +15649,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -15792,10 +15710,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "حرّر تنظيف جاف"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -15803,10 +15721,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "حرّر مصبغة/غسيل"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -15814,35 +15732,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "حرّر متجر نشاطات في الخلاء"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "مبيع لوازم للأنشطة رياضية"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "رياضة"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "نظاراتي"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
-msgstr "دفع نقدا"
+msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "مصرف"
@@ -15850,5 +15770,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
@@ -15856,10 +15776,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
-msgstr ""
+msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -15867,5 +15787,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -15873,15 +15793,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
-msgstr ""
+msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "أطباء"
@@ -15889,20 +15809,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -15910,5 +15830,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -15916,10 +15836,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "مستشفى"
@@ -15927,10 +15847,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -15939,5 +15859,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -15946,20 +15866,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -15967,5 +15887,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "بيطري"
@@ -15974,25 +15894,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "قارة"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "وطن"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "حرّر وطن"
@@ -16000,45 +15920,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "دولة/ولاية"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr ""
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "مدينة"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "بلدة"
@@ -16046,10 +15967,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "ضاحية"
@@ -16057,30 +15978,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "قرية"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "محلة"
@@ -16088,10 +16010,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "جزيرة"
@@ -16099,5 +16021,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
@@ -16105,5 +16027,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -16111,10 +16033,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "قمّة"
@@ -16122,10 +16044,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "جليد"
@@ -16133,10 +16055,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "بركان"
@@ -16144,70 +16066,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
-msgstr "حدود"
+msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "دولية"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
-msgstr "مدني"
-
-#. item
-#: build/trans_presets.java:2716
+msgstr "مدنية"
+
+#. item
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2728
+msgstr "محمية وطنية (بيئية)"
+
+#. item
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
-msgstr "حرّر حدود حديقة وطنية"
+msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "شجرة"
@@ -16216,15 +16138,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "حرج"
@@ -16233,5 +16155,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "حرّر حرج"
@@ -16239,17 +16161,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "غابة"
@@ -16258,19 +16180,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "حصاة"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "حرّر حصاة"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "أشجار منخفضة"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "حرّر أشجار منخفضة"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "هوّة"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "حرّر أرض بور"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -16279,70 +16245,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "مرج"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "حديقة"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "عشب"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16350,10 +16317,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "شائع"
@@ -16361,20 +16328,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "متنزه"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -16382,5 +16349,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -16388,15 +16355,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -16404,9 +16371,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -16414,39 +16381,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -16454,114 +16421,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "عسكري"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "حرّر الإستخدام العسكري للأرض"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "موقع ورشة إعمار"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "حرّر موقع ورشة إعمار"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "موقع ورشة إعمار"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "حرّر موقع ورشة إعمار"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
-msgstr "حرّر كسّارة، مقلع حجارة"
-
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "عسكري"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "حرّر الإستخدام العسكري للأرض"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "حصاة"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "حرّر حصاة"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "أشجار منخفضة"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "حرّر أشجار منخفضة"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "هوّة"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "حرّر أرض بور"
+msgstr "حرّر كسّارة / مقلع حجارة"
 
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -16571,5 +16495,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -16578,10 +16502,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "الفلق الخارجي"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -16589,5 +16513,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -16596,5 +16520,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -16602,34 +16526,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -16638,15 +16562,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "إلى الطريق"
@@ -16654,5 +16578,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "الطريق"
@@ -16661,5 +16585,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -16667,5 +16591,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -16737,24 +16661,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -16799,4 +16723,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16806,19 +16733,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -16832,10 +16760,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -16843,26 +16771,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -16871,30 +16799,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -17040,5 +16968,5 @@
 #: build/trans_style.java:140
 msgid "bridge"
-msgstr ""
+msgstr "جسر"
 
 #. color bridge
@@ -17078,4 +17006,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17087,4 +17122,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17186,13 +17230,15 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
-msgstr ""
+msgstr "مهجور"
 
 #. color foot
@@ -17232,7 +17278,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
-msgstr ""
+msgstr "خيل"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "حواجز"
 
 #. color tertiary
@@ -17268,8 +17529,8 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
-msgstr ""
+msgstr "شارع"
 
 #. color street
@@ -17323,7 +17584,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr ""
@@ -17370,108 +17631,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "سكة حديد"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "جسر"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17488,4 +17662,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "الخدمات"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17495,4 +17675,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "مأكولات"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17509,7 +17695,21 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
-msgstr ""
+msgstr "مستديرة دوران"
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "نقطة دخول طوارئ"
 
 #. color water
@@ -17522,5 +17722,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "شاطئ نهر"
@@ -17534,5 +17734,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "جدول نهر"
@@ -17546,5 +17746,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "حوض سفن"
@@ -17572,5 +17772,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "قنة جر"
@@ -17585,4 +17785,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17622,5 +17823,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17737,12 +17938,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "من صنع الإنسان"
@@ -17788,5 +17990,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17804,7 +18006,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17827,10 +18029,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17860,8 +18062,8 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
-msgstr ""
+msgstr "سكة حديد قديمة"
 
 #. color rail
@@ -17904,6 +18106,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -17917,5 +18119,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr ""
@@ -17937,5 +18139,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -17949,5 +18151,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -17970,4 +18172,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -17987,4 +18197,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "خط جوي"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -17993,23 +18209,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "خط جوي"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr ""
@@ -18023,5 +18226,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr ""
@@ -18035,5 +18239,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr ""
@@ -18046,6 +18251,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "خبير"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18059,5 +18279,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr ""
@@ -18088,4 +18309,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18120,4 +18349,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18130,8 +18383,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "طاقة"
@@ -18144,5 +18399,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "رصيف ميناء"
@@ -18156,5 +18414,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "خط أنابيب"
@@ -18282,12 +18540,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "وقت الفراغ"
@@ -18301,5 +18559,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "مارينا"
@@ -18371,8 +18629,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18408,4 +18666,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18465,11 +18731,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18608,6 +18874,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18834,22 +19121,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -18881,6 +19168,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -18916,4 +19203,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -18933,7 +19228,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "صحة"
@@ -19027,4 +19323,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19227,4 +19531,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19258,28 +19578,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "متجر/دكان"
@@ -19333,4 +19655,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19343,8 +19673,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "فندق"
@@ -19399,4 +19729,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19493,9 +19824,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "سياحة"
@@ -19567,8 +19898,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "تاريخي"
@@ -19638,9 +19969,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "خضار"
@@ -19654,7 +19985,7 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
-msgstr "كسارة"
+msgstr "كسارة / مقلع حجارة"
 
 #. color quarry
@@ -19666,5 +19997,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr ""
@@ -19686,5 +20017,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "حوض"
@@ -19698,5 +20029,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "غابة"
@@ -19710,5 +20041,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "فناء مزرعة"
@@ -19731,5 +20062,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "بيع بلمفرق"
@@ -19743,5 +20074,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "صناعي"
@@ -19755,5 +20086,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19767,5 +20098,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "حقل خضار"
@@ -19779,5 +20110,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -19834,7 +20165,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "عسكري"
@@ -19848,5 +20179,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "مقبرة/جبانة"
@@ -19859,5 +20190,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "قمّة"
@@ -19872,5 +20203,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "نهر الجليد"
@@ -19884,5 +20215,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "بركان"
@@ -19897,4 +20228,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19936,7 +20268,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "طبيعي"
@@ -19950,5 +20283,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "أشجار منخفضة"
@@ -19962,5 +20295,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "أرض بور"
@@ -19974,5 +20307,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "غابة/حرش"
@@ -19986,5 +20319,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "طين"
@@ -19998,5 +20331,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "شاطئ"
@@ -20074,8 +20407,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "طريق"
@@ -20123,7 +20456,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "الحدود"
@@ -20265,10 +20598,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "المكان"
@@ -20309,6 +20642,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "العنوان"
@@ -20456,10 +20796,10 @@
 #: build/trans_validator.java:47
 msgid "highway without a reference"
-msgstr ""
+msgstr "طريق عام بدون مرجع"
 
 #. way  : I : highway == motorway && nat_ref != *
 #: build/trans_validator.java:48
 msgid "temporary highway type"
-msgstr ""
+msgstr "نوع طريق عام مؤقت"
 
 #. *    : W : highway == road
@@ -20590,16 +20930,24 @@
 msgstr "شوارع  NRW Geofabrik.de"
 
-#~ msgid "News about JOSM"
-#~ msgstr "أخبار عن JOSM"
-
-#~ msgid "political"
-#~ msgstr "السياسية"
-
-#~ msgid "National_park"
-#~ msgstr "حديقة وطنية"
-
-#~ msgid "Update available"
-#~ msgstr "يوجد تحديث جديد"
-
-#~ msgid "Version Details:"
-#~ msgstr "الإصدار بلتفصيل:"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "إفتح..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "وصف الرمز"
+
+#~ msgid "Commit comment"
+#~ msgstr "أودع الملاحظات"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "إجهاض عملية النقل لسبب خطأ ( سأنتظر 5 ثواني ):"
+
+#~ msgid "Charge"
+#~ msgstr "رسم الدخول / الإستعمال"
+
+#~ msgid "sports"
+#~ msgstr "مبيع لوازم للأنشطة رياضية"
+
+#~ msgid "viaduct"
+#~ msgstr "جسر"
Index: /applications/editors/josm/i18n/po/bg.po
===================================================================
--- /applications/editors/josm/i18n/po/bg.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/bg.po	(revision 14844)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-29 14:29+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-01 21:26+0000\n"
 "Last-Translator: LandShark <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Създаване на интерфейса"
@@ -37,38 +37,38 @@
 "Проекцията не може да бъде прочетена от настройките. Ще използваме EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Съвет: Някои промени са дошли при качването на данните към сървъра."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Незаписани промени"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Има несъхранени промени. Да ги отхвърлим ли за да продължим?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Запис и Изход"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Откажи промените и Изход"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -79,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -93,4 +93,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -100,10 +101,10 @@
 msgstr "Отмяна"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнориране на неправилна препратка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -129,8 +130,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -271,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -407,6 +408,6 @@
 msgstr "Връщане и Комбиниране"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -414,20 +415,20 @@
 msgstr "Въведете стойности за всички конфликти."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Разрешаване на конфликти"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Обединяване {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Всички линии бяха празни"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -530,5 +531,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -650,6 +651,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -658,6 +659,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -787,5 +788,5 @@
 msgstr "Сливане въпреки всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -793,5 +794,5 @@
 "използва."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1068,5 +1069,5 @@
 msgstr "Запазване на текущите данни."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1076,26 +1077,26 @@
 "информирайте за тази грешка."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Няма отворени документи. Няма какво да се съхранява."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Празен документ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Документът не съдържа данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Записване въпреки всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Конфликти"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1105,32 +1106,32 @@
 "обработени все едно сте ги отменили всички. Да продължаваме ли?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Отхвърляне конфликтите и записване"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Съхраняване GPX файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Съхраняване OSM файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Невъзможно да се създаде резервно копие."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Неизвестно файлово разширение."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Възникна грешка при записване."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Възникна грешка при възстановяване на резервно копие."
@@ -1188,18 +1189,18 @@
 msgstr "Затваряне"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Разделяне на линия"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Разделяне на линията в избраната точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Текушата селекция не може да се използва за разделяне."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1207,5 +1208,5 @@
 msgstr[1] "Избраните точки не са в средата на път."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1221,9 +1222,9 @@
 "изберете и пътя."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "Избраните точки не се явяват част от един и същ път."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1231,6 +1232,6 @@
 msgstr[1] "Избраният път не съдържа избраните точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -1238,5 +1239,5 @@
 "път."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1246,5 +1247,5 @@
 "средата на пътя.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1254,5 +1255,5 @@
 "Трябва да проверите това и при необходимост да внесете корекции."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1410,46 +1411,50 @@
 "да продължите?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Качи на OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Качване на всички промени на OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Обекти за добавяне:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Променени обекти:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Обекти за изтриване:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Опишете измененията на качваните от вас данни:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Качване на тези промени?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Качване на промени"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Нищо за качване. Първо създайте някакви данни."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Има неразрешени конфликти. Първо трябва да ги разрешите."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Няма промени за качване."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Качване на данни"
@@ -1635,31 +1640,33 @@
 msgstr "Не може да се добави точка извън пределите на света."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Добавяне на точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Добавяне на точка в път"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Свързване на съществуващ път към точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Добавяне на нова точка към съществуващ път"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Добавяне на точка към път и съединяване"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Създаване нов възел."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Избиране на точката под курсора."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1668,9 +1675,4 @@
 msgstr[0] "Вмъкване на нов възел в път."
 msgstr[1] "Вмъкване на нов възел в {0} пътя."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Избиране на точката под курсора."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2098,5 +2100,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2291,5 +2293,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "железопътна линия"
@@ -2311,127 +2313,127 @@
 msgstr[1] "{0} точки"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Път, обознаващ граница на област, не е затворен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "мултиполигонен път ''{0}'' не е затворен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "В релацията има празен член."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "В релацията има член ''{0}'', който е бил изтрит."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Пътя ''{0}'' е с по-малко от две точки."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Повече от един път \"от\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Повече от един път \"до\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "Повече от един \"през\" са открити."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестна роля ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестен тип членство за ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Не е намерен път \"от\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Не е намерен път \"до\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "Не е открит възел или път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"до\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"от\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"до\" не започва или свършва в път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стил за ограничение {0} не е намерен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Не-Път ''{0}'' в мултиполигон."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Липсва външен път за мултиполигон ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Пресичане между пътища ''{0}'' и ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Вътрешният път ''{0}'' се намира отвън."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стилът за външния път ''{0}'' се разминава."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "немаркиран"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "текст"
@@ -2439,5 +2441,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2465,5 +2467,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "фон"
@@ -2531,5 +2533,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2543,5 +2545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2571,14 +2573,14 @@
 msgstr "оправена версия:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Съобщение за деня не е налично"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "- изпълняващата се версия е {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Зареждане на \"Съобщение на деня\""
@@ -2650,71 +2652,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Потребителско име"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Не е намерен превод за локал {0}. Връщане към {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "използване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Показване на тази помощ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Стандартен параметри на unix геометрия"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Сваляне на област в предала на рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Сваляне на област по препратка (с параметри lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Отваряне на файл (како GPS данни, ако е .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Сваляне на област от рамка, като GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Избор с даденото търсене"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr "Стартиране в максимизиран режим"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Възстановяване на параметрите по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Избор език."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "примери"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2724,23 +2726,28 @@
 "че зареждате данни преди --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Вместо --download=<bbox> може да укажете osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Активиране обновените разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Зареждане на ранните разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Настройки по умълчание"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Зареждане на разширения"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2919,5 +2926,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3128,5 +3135,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Роля"
@@ -3174,73 +3181,71 @@
 msgstr "Параметри / Отношения"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Приложи промените"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Създаване нова релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Редактиране на нова релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Редактиране релация #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Основен"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Обект"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Маркери (празна стойност изтрива маркера)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Преместване нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Преместване на текущо избраните членове нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Добавяне на избраните"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Добавяне на всички текущо обекти като членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Изтриване на избраното"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Изтриване на всички текущи избрани обекти от релацията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Преместване надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Преместване на текущо избраните членове надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3249,36 +3254,36 @@
 msgstr "Премахни"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Изтриване на члена от текущия ред на таблицата от тази релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Сваляне членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Сваляне всички непълни пътища и възли от релацията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Членове: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Редактор релации: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Възникнаха конфликти при импортване."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Грешка при разбор на отговора на сървъра."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Невъзможно да се установи връзка със сървъра."
@@ -3292,10 +3297,11 @@
 msgstr "Изтриване на избраната релация"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Релации"
@@ -3490,5 +3496,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Места"
@@ -3535,21 +3541,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "тип"
@@ -3602,10 +3608,7 @@
 msgstr "Използвайте мишката или Ctrl+стрелките/./ за мащабиране."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Карта"
@@ -3759,4 +3762,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3862,5 +3866,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3923,19 +3927,34 @@
 "смислено да се предположи тяхното време, бяха пропуснати."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "извън областта за сваляне"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} се състои от:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} изтрити.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "използване"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3943,21 +3962,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4403,5 +4422,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4486,4 +4505,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4567,7 +4588,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4580,7 +4598,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4596,10 +4621,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4768,5 +4793,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4800,7 +4827,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4884,4 +4911,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4934,4 +4969,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4940,7 +4981,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4949,15 +4987,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4982,129 +5009,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Име"
@@ -5153,12 +5182,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Зареждане на всички квадранти"
+msgstr "Само локални файлове"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Зона"
+msgstr "Никога"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5186,45 +5213,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Автомобил"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Вело"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5232,25 +5249,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Пеш"
@@ -5299,7 +5321,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Съединявай с линии точките от GPS следите."
+msgstr "Свързване с линии на GPS точките"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5946,10 +5967,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "Грешка! Възможно е да липсват маркери (тагове)."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Подготвяне на данните..."
@@ -5959,25 +5980,75 @@
 msgstr "Грешка при разбор: невалидна структура на gpx документа"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Отваряне на списък промени по версии..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Затваряне на списък промени по версии..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Няма промени за качване."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Подготвяне…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Качване..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Грешка при разбор на отговора на сървъра."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Неизвестен хост"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Грешна парола или потребителско име."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Внимание: Паролата ще бъде предадена нешифрирана."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Съхрани потребителското име и паролата (нешифрирано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Въведете парола"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Вход"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5988,44 +6059,52 @@
 msgstr "Грешка при разбор."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Неизвестна версия"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Неизвестна версия"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Намерен е елемент <nd> извън път."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "към <nd> няма обръщения ref."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Открит е маркер <member> извън релация."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Непълна спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Недопустим обект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Липсва необходимия атрибут \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Подготовка на OSM данните..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Неправилен код на точка"
@@ -6035,5 +6114,5 @@
 msgstr "Свързване със сървъра..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -6041,5 +6120,5 @@
 "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6049,55 +6128,8 @@
 "повторете опита си по-късно."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Опишете измененията на качваните от вас данни:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Коментар на съхранението"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} остава. Качване {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Възникна грешка: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Отваряне на списък промени по версии..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Сървъра не поддържа управление на версиите"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Неизвестен хост"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Подготвяне…"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Качване..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Затваряне на списък промени по версии..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Прехвърлянето прекъснато поради грешка (повторен опит след 5 сек):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6270,6 +6302,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "неизвестно"
@@ -6459,7 +6491,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Създаване на области"
+msgstr "Създаване мрежа от пътища"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6468,17 +6499,18 @@
 "in common"
 msgstr ""
+"Образува мрежа от пътища на база два съществуващи, които имат множество "
+"възли и поне един общ."
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Изберете два пътя с общ възел"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Изберете два пътя с единствен общ възел"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Създаване на области"
+msgstr "Създаване мрежа от пътища"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6502,5 +6534,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Описание"
@@ -7781,7 +7813,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "вода"
@@ -8089,5 +8121,5 @@
 msgstr "Цикъл на сваляне от OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Показване на проблеми от OpenStreetBugs"
@@ -8106,4 +8138,11 @@
 msgstr "Внимание"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Възникна грешка: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8133,35 +8172,38 @@
 "от OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Добавете коментар"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Въведете вашия коментар"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Маркирайте \"направено\""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Наистина ли искате да маркирате проблема като ''решен''?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Действително да затворим?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Нов проблем"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Създаване на нов проблем"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Опишете проблема колкото можете по-подробно"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Създаване на нов проблем"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8190,5 +8232,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8198,9 +8240,9 @@
 "\"Картови настройки\" (Map Settings) от настройките."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "osmarender опции"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "изпълним файл на Firefox"
@@ -8275,129 +8317,113 @@
 "URL:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Навигация"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr "Маршрутизиране"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Нищо"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "Натиснете за добавяне на възли към маршрут."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Щракнете за да вмъкнете нова точка."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "Натисни и влачи за преместване на възли от маршрут"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Щракнете за да вмъкнете нова точка."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "Натиснете за добавяне на възли към маршрут."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "Отваряне списък с възли на маршрут"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "Изтриване на повтарящи се точки..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Отваряне списък с всички релации."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Гара / Станция / Спирка"
+msgid "Add routing layer"
+msgstr "Добавяне на нов слой"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "средно"
+msgstr "Критерий"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Обувки"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "Най-кратък"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "По-бързо"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "Най-бърз"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Обръщане разделянето на сграда"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr "Обратен маршрут"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Ферибот маршрут"
+msgstr "Изчистване маршрут"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Настройки модул WMS"
+msgstr "Настройки на разширение маршрутизатор"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Настройка сайтове за разширения"
+msgstr "Настройване предпочитания за маршрутизиране"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Магистрален изход"
+msgstr "Клас път"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Макс. скорост (км/ч)"
+msgstr "Скорост (км/ч)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Височина"
+msgstr "Тегло"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "Въведете стойности за тегло"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Интерактивна карта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Зареждане на квадрант"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Показване статуса на квадрант"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Изискване на обновяване"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Зареждане на всички квадранти"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Увеличаване на мащаба"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Намаляне на мащаба"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "изображението не е заредено"
@@ -8420,34 +8446,34 @@
 msgstr "Настройки на разширение SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Източници на квадранти"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Авто мащаб: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Автозареждане Квадранти: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Макс.мащаб ниво: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Фон при избледняване: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "грешка при зареждане на метаданните"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "изискани: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "грешка при изискване на обновяване"
@@ -8462,5 +8488,5 @@
 msgstr "Запис на данните във файл на всяка минута."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8516,7 +8542,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Редактирай област/щат"
+msgstr "Редактиране маркери"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8524,66 +8549,58 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Стартира редактора за маркери"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "JOSM Редактор за маркери"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "няма/никой"
+msgstr "(никой)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "подчертай"
+msgstr "Подчертване"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "многобой"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr "<няколко>"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Промяна параметрите на {0} обект"
-msgstr[1] "Промяна параметрите на {0} обекта"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] "Премахване стари ключове от {0} обекта"
+msgstr[1] "Премахване стари ключове от {0} обекти"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Промяна параметрите на {0} обект"
-msgstr[1] "Промяна параметрите на {0} обекта"
+msgstr[0] "Обновяване свойствата на {0} обекта"
+msgstr[1] "Обновяване свойствата на {0} обекти"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "маршрут"
+msgstr "Група"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Поток"
+msgstr "Обект"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Търсене"
+msgstr "Търси: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Файл"
+msgstr "Филтър"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Автомобил"
+msgstr "Изчисти"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8671,5 +8688,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Име на улица"
@@ -8770,24 +8787,21 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Добавен възел на всички кръстовища"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
+msgstr "Изтриване Пътища, които не са част от вътрешен мултиполигон"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "релация"
+msgstr "Поправяне релации"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Свържи препокриващи се Области"
+msgstr "Свързана само-пресичаща се област"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Свържи препокриващи се Области"
+msgstr "Свързана пресичаща област"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8800,31 +8814,26 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Разрешяване конфликти."
+msgstr "Поправяне конфликти маркери"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Изтриване от релация"
+msgstr "Премахнати елементи от Релации"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Присъедини области: премахване на кратки пътища"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Незатворени пътища."
+msgstr "Затворен Път"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Премахване на снимка от слой"
+msgstr "Премахване на маркери от вътрешни пътища"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Магистрален възел"
+msgstr "Функция свързване на области"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9428,4 +9437,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9507,7 +9522,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "сграда"
@@ -9521,5 +9536,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "област"
@@ -9824,4 +9839,9 @@
 msgstr "Не може да се достъпи входния аудио поток от входното URL"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9855,7 +9875,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Създаване на области"
+msgstr "Създаване мрежа от пътища"
 
 #. Plugin DirectUpload
@@ -9965,21 +9984,28 @@
 "изображение."
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великият JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr "Позволява на други приложения да изпращат команди към JOSM."
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Предоставя маршрутизиращи възможности."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9990,15 +10016,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволява добавянето на маркери/възли на текущата gps позиция."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
+msgstr "Предоставя диалог за редактиране на маркери в табличен вид."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -10012,15 +10038,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr "Директно зареждане на TCX файлове от JOSM."
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr "Създава терасовидни къщи от един блок."
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -10032,5 +10058,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -10041,5 +10067,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -10051,5 +10077,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10139,5 +10165,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Означение"
@@ -10192,7 +10218,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Слой / Ниво"
@@ -10235,5 +10261,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорост (км/ч)"
@@ -10281,5 +10307,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Еднопосочна"
@@ -10335,5 +10361,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Мост"
@@ -10383,5 +10409,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Тунел"
@@ -10428,5 +10454,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Просека"
@@ -10473,5 +10499,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Насип"
@@ -10629,6 +10655,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
@@ -10677,5 +10703,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Пътна настилка"
@@ -10707,5 +10733,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "асфалтиран път"
@@ -10716,5 +10742,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "неасфалтиран път"
@@ -10728,5 +10754,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "павиран път"
@@ -10878,5 +10904,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10897,6 +10923,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "да"
@@ -11040,7 +11066,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "не"
@@ -11054,73 +11080,63 @@
 msgstr "Камион (над 3.5т)"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Кон"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Мотоциклет"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Автомобил"
@@ -11195,130 +11211,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Тип"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11326,5 +11230,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11332,11 +11236,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11344,5 +11242,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11350,5 +11248,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11356,5 +11254,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11362,6 +11260,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11380,6 +11284,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "автомагистрала"
@@ -11405,6 +11309,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "автострада"
@@ -11430,6 +11334,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "главен / първокласен"
@@ -11455,6 +11359,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "второкласен"
@@ -11468,5 +11372,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "третокласен"
@@ -11484,5 +11388,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "улица"
@@ -11500,5 +11404,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "служебна"
@@ -11525,6 +11429,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "ремонт"
@@ -11565,6 +11469,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11575,5 +11478,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "кръгово"
@@ -11917,14 +11820,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Оператор"
@@ -11949,20 +11852,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "неконтролирано"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "светофар"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "остров"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "немаркиран"
@@ -11970,5 +11873,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "Пресичане върху кон"
@@ -11977,5 +11880,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "Пресичане с велосипед"
@@ -11985,5 +11888,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "Помощник при пресъчане"
@@ -12132,10 +12035,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -12148,29 +12052,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Стъпалова преграда"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Редактирай стъпалова преграда"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Дирек"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Редактирай дирек"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12179,7 +12072,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12188,235 +12084,223 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Разрешено преминаване:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr "Вело бариера"
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Бетонен блок"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Тексаска мрежа (препятствие за животни)"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Редактирай тексаска мрежа"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "Бус трап"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr "Шипове"
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr "Редактиране шипове"
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Място за плащане пътна такса"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Редактирай място за плащане пътна такса"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Граничен контрол"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Редактирай граничен контрол"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Плет"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Ограда / стобор"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Стена"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Градска стена"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Подпорна стена"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Вход"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Редактирай вход"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "Порта"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "Редактирай порта"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "Вдигаще се врата"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "Вдигаще се врата"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Врата с бодлива тел"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Редактирай врата с бодлива тел"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Накланяща преграда (bump gate)"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Редактирай накланяща преграда"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "Кисинг гейт (преграда срещу животни)"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
 msgstr "Редактирай кисинг гейт"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Врата с бодлива тел"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Редактирай врата с бодлива тел"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Дирек"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Редактирай дирек"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Подвижен мост"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Редактирай подвижен мост"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "Бус трап"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Тексаска мрежа (препятствие за животни)"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Редактирай тексаска мрежа"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr "Шипове"
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr "Редактиране шипове"
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Падаща решетка"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Редактирай падаща решетка"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "Порта"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "Редактирай порта"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr "Вдигаще се врата"
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr "Вдигаще се врата"
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Стъпалова преграда"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Редактирай стъпалова преграда"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Двойна врата"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Редактирай двойна врата"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Накланяща преграда (bump gate)"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Редактирай накланяща преграда"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr "Вело бариера"
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Плет"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Ограда / стобор"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Бетонен блок"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Стена"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Градска стена"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Подпорна стена"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Място за плащане пътна такса"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Редактирай място за плащане пътна такса"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Граничен контрол"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Редактирай граничен контрол"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Вход"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Редактирай вход"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Извор"
@@ -12424,5 +12308,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Редактирай извора"
@@ -12430,5 +12314,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Отточен канал"
@@ -12436,10 +12320,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Редактирай отточен канал"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Поток"
@@ -12447,10 +12331,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Редактирай поток"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Канал"
@@ -12458,10 +12342,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Редактирай канал"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Река"
@@ -12471,5 +12355,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Редактирай река"
@@ -12477,15 +12361,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Редактирай водата"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Суша"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Редактирай сушата"
@@ -12493,15 +12377,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Басейн"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Редактиране на басейн"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Резервоар"
@@ -12509,15 +12393,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Редактирай резервоар"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Закрит резервоар"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Редактирай закрит резервоар"
@@ -12525,5 +12409,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Речен бряг"
@@ -12532,10 +12416,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Редактирай речен бряг"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Мочурище"
@@ -12546,56 +12430,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Редактирай мочурището"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "блато"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "тресавище"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "блато"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "тръстенак"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "солени блата / солници"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "приливно-отливно крайбрежие"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "мангрова гора"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Кал"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Редактирай калта"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Плаж"
@@ -12603,20 +12487,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Редактирай плажа"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Залив"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Редактирай залива"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Скала"
@@ -12624,10 +12508,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Редактирай скалата"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Крайбрежие"
@@ -12635,5 +12519,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Редактирай крайбрежието"
@@ -12641,5 +12525,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Ферибот маршрут"
@@ -12647,5 +12531,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Ферибот"
@@ -12654,5 +12538,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Корабостроителница"
@@ -12660,10 +12544,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Редактирай корабостроителница"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Док"
@@ -12671,5 +12555,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Редактирай док"
@@ -12677,5 +12561,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Язовирна стена"
@@ -12683,15 +12567,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Редактирай язовирна стена"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Хидротехническо съоръжение"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Шлюзова врата"
@@ -12700,5 +12584,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Бент / преливник"
@@ -12706,20 +12590,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Редактирай бент / преливник"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Редактирай водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Разширение за обръщане"
@@ -12728,15 +12612,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Пристанище за яхти"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Редактирай пристанище за яхти"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Кей"
@@ -12744,10 +12628,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Редактирай кей"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Ферибот терминал"
@@ -12755,10 +12639,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Редактирай ферибот терминал"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Хелинг"
@@ -12768,5 +12652,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Редактирай хелинг"
@@ -12774,10 +12658,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Железница"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "ЖП Линия"
@@ -12785,5 +12669,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Редактирай ЖП Линия"
@@ -12813,8 +12697,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Незадължителни типове"
@@ -12828,35 +12712,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "двор"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "ЖП стрелка"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "скоростна"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Теснолинейка"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Редактирай теснолинейка"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Монорелса"
@@ -12864,45 +12748,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Редактирай монорелса"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Историческа ЖП линия"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Редактирай историческа ЖП линия"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Лека ЖП линия"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Редактирай лека ЖП линия"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Метро"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Редактирай метро"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Трамвай"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Редактирай трамвай"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Направляван автобус"
@@ -12910,5 +12794,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Редактирай направляван автобус"
@@ -12917,14 +12801,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Неизползвана ЖП линия"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Редактирай неизползвана ЖП линия"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Изоставена ЖП линия"
@@ -12933,5 +12817,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Регулиран ЖП прелез"
@@ -12940,5 +12824,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "ЖП прелез"
@@ -12948,5 +12832,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr "Тип пресичане"
@@ -12954,5 +12838,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "ЖП Обръщаща платформа"
@@ -12961,10 +12845,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Надземни линии"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Седалков лифт"
@@ -12972,10 +12856,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Редактирай седалков лифт"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Влек"
@@ -12983,10 +12867,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Редактирай влек"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Кабинков лифт"
@@ -12994,24 +12878,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Редактирай кабинков лифт"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Редактирай голф"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Гара / Станция / Спирка"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Редактирай станция"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Бензиностанция"
@@ -13021,5 +12918,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Редактирай бензиностанция"
@@ -13035,5 +12932,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -13043,5 +12940,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Редактирай паркинг"
@@ -13049,40 +12946,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Капацитет"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "наземен"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "на няколко нива"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "подземен"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "паркинг за прехвърляне на обществен транспорт"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Места за инвалиди"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Такса"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Автомивка"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Редактирай автомивка"
@@ -13090,5 +12988,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Магазин"
@@ -13096,15 +12994,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Редактирай автосалон"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Сервиз"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Редактирай автосервиз"
@@ -13112,5 +13010,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Под наем"
@@ -13119,10 +13017,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Редактиране коли под наем"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Споделяне на автомобили"
@@ -13130,5 +13028,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Редактирай споделяне автомобили"
@@ -13136,5 +13034,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Велосипедна стоянка (паркинг)"
@@ -13143,5 +13041,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Редактиране велосипеди под наем"
@@ -13150,15 +13048,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Редактирай вело-магазин"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Обществен транспорт"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Референция"
@@ -13166,5 +13064,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Малка ЖП гара"
@@ -13172,5 +13070,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Редактирай малка ЖП гара"
@@ -13178,5 +13076,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Трамвайна спирка"
@@ -13185,5 +13083,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Редактирай трамвайна спирка"
@@ -13191,5 +13089,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "ЖП платформа"
@@ -13198,5 +13096,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Редактирай ЖП платформа"
@@ -13208,5 +13106,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "Референция (коловоз #)"
@@ -13214,10 +13112,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Област"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -13226,10 +13124,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Редактирай вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Инвалидна количка"
@@ -13238,5 +13136,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Автогара"
@@ -13245,5 +13143,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Редактирай автогара"
@@ -13251,5 +13149,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Автобусна спирка"
@@ -13259,5 +13157,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Редактирай автобусна спирка"
@@ -13265,10 +13163,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Автобусна платформа"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Редактирай автобусна платформа"
@@ -13276,5 +13174,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Такси"
@@ -13282,5 +13180,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Редактирай стоянка таксита"
@@ -13288,5 +13186,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Летище"
@@ -13294,15 +13192,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Редактиране летище"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13311,5 +13209,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Настаняване"
@@ -13321,5 +13219,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Хотел"
@@ -13328,15 +13226,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Редактирай хотел"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Звезди"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Мотел"
@@ -13344,20 +13242,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Редактирай мотел"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Къща за гости"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Редактирай къща за гости"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Бунгало"
@@ -13365,10 +13263,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Редактирай бунгало"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Хостел / студентско общежитие"
@@ -13376,30 +13274,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Редактирай хостел / студентско общежитие"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Планинска хижа"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Редактирай планинска хижа"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Площадка за каравани"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Редактирай площадка за каравани"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Къмпинг"
@@ -13407,10 +13305,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Редактирай къмпинг"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Храна и напитки"
@@ -13421,5 +13319,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторант"
@@ -13427,5 +13325,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Редактирай ресторант"
@@ -13433,5 +13331,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Кухня"
@@ -13439,61 +13337,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "италианска"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "китайска"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "пица"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "бургери"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "гръцка"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "немска"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "индийска"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "местна"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "турска"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "азиатска"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "тайландска"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "мексиканска"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "японска"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Заведение за бързо хранене"
@@ -13501,9 +13399,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Редактирай заведение бързо хранене"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Кафене"
@@ -13511,10 +13409,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Редактирай кафене"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Бар"
@@ -13522,20 +13420,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Редактирай бар"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Бирария"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Редактирай бирария"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "Бар"
@@ -13543,10 +13441,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "Редактиране на бар"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Нощен клуб"
@@ -13554,20 +13452,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Редактирай нощен клуб"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Туризъм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Атракция"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Редактирай забележилтеност"
@@ -13576,11 +13474,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Работно време"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "Музей"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "Редактирай музей"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "Зоопарк"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "Редактирай зоопарк"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "Място с добра гледка"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "Редактирай място с добра гледка"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Наблюдателница"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "Развлекателен парк"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "Редактирай развлекателен парк"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "Творба на изкуството"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "Редактирай творба на изкуството"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "Информационен пункт"
@@ -13588,143 +13547,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
 msgstr "Редактиране на информационен пункт"
 
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "Музей"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "Редактирай музей"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "Зоопарк"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "Редактирай зоопарк"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "Място с добра гледка"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "Редактирай място с добра гледка"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Наблюдателница"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "Развлекателен парк"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "Редактирай развлекателен парк"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "Творба на изкуството"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "Редактирай творба на изкуството"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr "Тип карта"
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr "карта"
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr "карта на града"
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr "карта туристически маршрути"
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr "карта на веломаршрути"
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr "По-подробно описание"
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr "Информационно табло"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr "Тип табло"
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr "информативна дъска"
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr "история"
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr "природа"
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr "дива природа"
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr "Водач"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr "Тип карта"
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr "карта"
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr "карта на града"
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr "карта туристически маршрути"
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr "карта на веломаршрути"
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr "По-подробно описание"
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr "Информационно табло"
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr "Тип табло"
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr "информативна дъска"
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr "история"
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr "природа"
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr "дива природа"
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr "Други информационни точки"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Навес"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Редактирай навес"
@@ -13732,25 +13631,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "място за огън"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Място за пикник"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Редактирай място за излет"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Исторически места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Замък"
@@ -13759,20 +13658,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Редактирай замък"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Руини"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Редактирай руини"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Архиологични разкопки"
@@ -13781,20 +13680,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Редактирай архиологични разкопки"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Поле на битка"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Редактирай поле на битка"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Забележителност"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Редактирай забележителност"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Паметник"
@@ -13802,56 +13713,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Редактирай паметник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Поле на битка"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Редактирай поле на битка"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Редактирай крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Крайпътен параклис"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Редактирай крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Редактирай аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Площадка"
@@ -13859,15 +13759,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Редактирай площадка"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Риболов"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Редактирай риболов"
@@ -13875,15 +13775,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Спортни съоражения"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Редактирай стадион"
@@ -13897,6 +13797,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "вид спорт:"
@@ -13975,4 +13875,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14264,28 +14172,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "спорт"
@@ -14295,227 +14204,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "многобой"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "стрелба с лък"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "австралийски футбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "игра с мет.топчета"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "игра с асим.топки"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "кану"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "алпинизъм"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "крикет мрежи"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "кучешки надбягвания"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "конна езда"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "голф"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "конни надбягвания"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "моторен спорт"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "ракет бол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "ръгби"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "стрелба"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "фигурно пързаляне"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "ски"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "плуване"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "тенис на маса"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "тенис"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Спортен център"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Редактирай спортен център"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Игрище"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Редактирай игрище"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Състезателна писта"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Редактирай състезателна писта"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Поле за голф"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Редактирай поле за голф"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Миниголф"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Редактирай миниголф"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Многобой"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Редактирай многобой"
@@ -14554,191 +14463,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "игрище"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "спортен център"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "Боулинг зала"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "Редактирай боулинг зала"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Редактирай атлетика"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Стрелба с лък"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Редактирай стрелба с лък"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Скално катерене"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Редактирай скално катерене"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Кану"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Редактирай кану"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Велосипедизъм"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Редактирай велосипедизъм"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Надпреварване с кучета"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Редактирай надбягвания с кучета"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Конна езда"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Редактирай конна езда"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Конни надбягвания"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Редактирай конни надбягвания"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Редактирай гимнастика"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Моторни спортове"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Редактирай моторни спортове"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Фигурно пързаляне"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Редактирай фигурно пързаляне"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Редактирай скейтборд"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Плуване"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Редактирай плуване"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Ски"
@@ -14746,56 +14655,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Редактирай ски"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Тип писта"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "спускане"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "нордическа"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "Зимен парк"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Трудност"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "начинаещ"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "лесно"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "средно"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "напреднали"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "експерт"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "свободна езда"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "Стрелба"
@@ -14803,178 +14714,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Редактирай стрелба"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Спорт (с топка)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Редактирай футбол"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Американски футбол"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Редактирай американски футбол"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Голф"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "ракет"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Ръгби"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Редактирай ръгби"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Сгради"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Строеж"
@@ -14982,5 +14893,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -14988,10 +14899,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Кметство"
@@ -14999,10 +14910,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Посолство"
@@ -15010,10 +14921,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -15022,10 +14933,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Затвор"
@@ -15034,10 +14945,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -15047,10 +14958,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -15059,10 +14970,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -15070,5 +14981,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -15076,15 +14987,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Училище"
@@ -15092,10 +15003,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Университет"
@@ -15103,10 +15014,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Колеж"
@@ -15114,5 +15025,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -15120,5 +15031,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Кино"
@@ -15127,10 +15038,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Библиотека"
@@ -15139,10 +15050,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -15150,10 +15061,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Театър"
@@ -15162,10 +15073,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -15175,5 +15086,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -15182,6 +15093,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Религия"
@@ -15190,66 +15101,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "Унитаризъм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Конфесия"
@@ -15258,81 +15170,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "Сунити"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Адреси"
@@ -15341,5 +15253,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Редактиране на информацията за адреса"
@@ -15347,5 +15259,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Номер"
@@ -15353,20 +15265,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Код на държава"
@@ -15374,5 +15286,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -15381,5 +15293,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Редактирай интерполация на адреси"
@@ -15387,67 +15299,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Схема на номериране"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "нечетни"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "всички"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "атлетика"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Цех"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Кула"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -15455,10 +15372,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Мелница"
@@ -15466,10 +15383,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -15477,10 +15394,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -15490,10 +15407,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Кран"
@@ -15501,10 +15418,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Редактирай кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -15512,10 +15429,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -15523,10 +15440,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -15534,5 +15451,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
@@ -15540,5 +15457,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -15548,39 +15465,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "газ"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Електростанция"
@@ -15589,10 +15506,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -15601,5 +15518,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -15607,10 +15524,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -15621,5 +15538,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
@@ -15627,5 +15544,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -15634,25 +15551,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Волтаж"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Брой жици"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Тоалетни"
@@ -15660,25 +15577,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Ref номер"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Такса"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Телефон"
@@ -15687,5 +15599,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -15693,5 +15605,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Монети"
@@ -15699,5 +15611,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Банкноти"
@@ -15705,5 +15617,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -15711,5 +15623,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -15717,15 +15629,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -15734,5 +15646,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -15740,35 +15652,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Консервни кутии"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Скамейка"
@@ -15777,20 +15689,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Скривалище"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Заключване"
@@ -15798,22 +15710,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Фонтан"
@@ -15822,10 +15734,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -15834,10 +15746,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -15845,25 +15757,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Бакалия"
@@ -15871,10 +15783,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Редактирай бакалия"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Будка"
@@ -15882,10 +15794,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Редактирай будка"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -15893,5 +15805,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Редактирай автомат за стоки"
@@ -15899,88 +15811,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Продукти за автоматична продажба"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "билети за обществен транспорт"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "телефонни ваучери"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "торби за екскременти"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr "клиентски карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Месарница"
@@ -15988,10 +15900,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Редактирай месарница"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Фурна"
@@ -15999,10 +15911,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Редактирай фурна"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Цветарски магазин"
@@ -16010,70 +15922,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Редактирай цветарски магазин"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "Био магазин"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Редактирай био магазин"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Училище"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Редактирай магазин за обувки"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Редактирай магазин за напитки"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Компютри"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Редактирай компютърен магазин"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Електроника"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Редактирай магазин за електроника"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Аудио HiFi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Редактирай магазин за Аудио HiFi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Мебелен магазин"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Редактирай мебелен магазин"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Градински център"
@@ -16081,10 +16007,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Редактирай градински център"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "Железария"
@@ -16092,10 +16018,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "Редактирай железария"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Направи си сам\""
@@ -16103,60 +16029,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "Редактирай магазин \"Направи си сам\""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Книжарница"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Редактирай книжарница"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Фризьорски салон / козметика"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Редактирай фризьорски салон / козметика"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Обувки"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Редактирай магазин за обувки"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Играчки"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Редактирай магазин за играчки"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "Видео"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "Редактирай Видео-магазин"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Химическо чистене"
@@ -16164,10 +16090,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Редактирай химическо чистене"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Пералня"
@@ -16175,10 +16101,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Редактирай пералня"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Туристически стоки (за активен отдих)"
@@ -16186,35 +16112,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Редактирай мазизин за туристически стоки"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "спортни"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Спорт"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Редактирай магазин за спортни стоки"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "Оптика"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Редактирай оптика"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Банка"
@@ -16222,5 +16150,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Редактирай банка"
@@ -16228,10 +16156,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -16239,5 +16167,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Редактирай обмяна на валута"
@@ -16245,15 +16173,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Доктори"
@@ -16261,20 +16189,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Редактирай доктори"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -16282,5 +16210,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Редактирай аптека"
@@ -16288,10 +16216,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "Приготвят лекарства по рецепти"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Болница"
@@ -16299,10 +16227,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -16311,5 +16239,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -16318,20 +16246,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Телефонен номер"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -16339,5 +16267,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -16346,25 +16274,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Континент"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Държава"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Редактирай държава"
@@ -16372,45 +16300,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Област/Щат"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Област"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Графство"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Редактирай графство"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -16418,10 +16347,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Редактирай град"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -16429,30 +16358,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Село"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Местност"
@@ -16460,10 +16390,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Остров"
@@ -16471,5 +16401,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Редактирай остров"
@@ -16477,5 +16407,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -16483,10 +16413,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Редактиране пещерен вход"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Връх"
@@ -16494,10 +16424,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Редактиране връх"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Ледник"
@@ -16505,10 +16435,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Редактиране ледник"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Вулкан"
@@ -16516,70 +16446,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Редактиране вулкан"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Национална"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Административна"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr "Политическа"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr "Национален парк"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Дърво"
@@ -16588,15 +16518,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Гора"
@@ -16605,5 +16535,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Редактирай гората"
@@ -16611,17 +16541,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "иглолистен"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Гора"
@@ -16630,19 +16560,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Редактирай гора"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Сипей"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Редактирай сипей"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Шубрак"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Редактирай шубрака"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Скалист склон"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Редактирай скалист склон"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Пустош"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Редактиране пустош"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -16651,70 +16625,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Общинска земя"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Редактирай общинска земя"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Градина"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Трева"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "Зелено село"
@@ -16722,10 +16697,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Общи"
@@ -16733,20 +16708,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Парк"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -16754,5 +16729,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -16760,15 +16735,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -16776,9 +16751,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Гробище"
@@ -16786,39 +16761,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -16826,114 +16801,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Военен"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Редакирай военна земя"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Строителна площадка"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Редактирай строителна площадка"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Строителна площадка"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Редактирай строителна площадка"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Военен"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Редакирай военна земя"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Сипей"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Редактирай сипей"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Шубрак"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Редактирай шубрака"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Скалист склон"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Редактирай скалист склон"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Пустош"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Редактиране пустош"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -16943,5 +16875,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -16950,10 +16882,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "външен сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -16961,5 +16893,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -16968,5 +16900,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -16974,34 +16906,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "само направо"
@@ -17010,15 +16942,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "до път"
@@ -17026,5 +16958,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Маршрут"
@@ -17033,5 +16965,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -17039,5 +16971,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Тип маршрут"
@@ -17109,24 +17041,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "велосипед"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "ски"
@@ -17171,4 +17103,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17178,19 +17113,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "пеш"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "туристически маршрут"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "обиколка"
@@ -17204,10 +17140,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -17215,26 +17151,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -17243,30 +17179,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "точка за спиране назад"
@@ -17450,4 +17386,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17459,4 +17502,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17558,11 +17610,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "остарял, вече невалиден"
@@ -17604,7 +17658,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "кон"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Прегради"
 
 #. color tertiary
@@ -17640,6 +17909,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "улица"
@@ -17695,7 +17964,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "път_от_пътна_мрежа"
@@ -17742,108 +18011,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "ЖП"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "виадукт"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17860,4 +18042,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "служебна"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17867,4 +18055,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Брод"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17881,8 +18075,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "обръщало"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "Пункт за връзка със спешна помощ"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17894,5 +18102,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "речен бряг"
@@ -17906,5 +18114,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "поток"
@@ -17918,5 +18126,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "док"
@@ -17944,5 +18152,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "акведукт"
@@ -17957,4 +18165,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17994,5 +18203,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18109,12 +18318,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "изкуствени съоръжения"
@@ -18160,5 +18370,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18176,7 +18386,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr "ЖП точка"
@@ -18199,10 +18409,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr "друга ЖП линия"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr "ЖП railover"
@@ -18232,6 +18442,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr "стара ЖП линия"
@@ -18276,6 +18486,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "въздушен транспорт"
@@ -18289,5 +18499,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "терминал"
@@ -18309,5 +18519,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "Надземен_транспорт_тъмен"
@@ -18321,5 +18531,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "Надземен_транспорт_светъл"
@@ -18342,4 +18552,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18359,4 +18577,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "надземен транспорт"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18365,23 +18589,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "надземен транспорт"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "лесна ски писта"
@@ -18395,5 +18606,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "средно трудна ски писта"
@@ -18407,5 +18619,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "ски писта за напреднали"
@@ -18418,6 +18631,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "ски писта freeride"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "ски писта freeride"
@@ -18431,5 +18659,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "ски писта за начинаещи"
@@ -18460,4 +18689,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18492,4 +18729,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18502,8 +18763,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "захранване"
@@ -18516,5 +18779,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "кей"
@@ -18528,5 +18794,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "тръбопровод"
@@ -18654,12 +18920,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "отдих и развлечение"
@@ -18673,5 +18939,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "яхт пристан"
@@ -18743,8 +19009,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "Обществени услуги"
@@ -18780,4 +19046,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18837,11 +19111,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "Обществен трафик"
@@ -18980,6 +19254,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19206,22 +19501,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "Обществено осветление"
@@ -19253,6 +19548,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "светла_вода"
@@ -19288,4 +19583,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19305,7 +19608,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "здравеопазване"
@@ -19399,4 +19703,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19599,4 +19911,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19630,28 +19958,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "магазин"
@@ -19705,4 +20035,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19715,8 +20053,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "хотел"
@@ -19771,4 +20109,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19865,9 +20204,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "туризъм"
@@ -19939,8 +20278,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "исторически"
@@ -20010,9 +20349,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "зеленина"
@@ -20026,5 +20365,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "кариер"
@@ -20038,5 +20377,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "сметище"
@@ -20058,5 +20397,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "басейн"
@@ -20070,5 +20409,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "гора"
@@ -20082,5 +20421,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "двор ферма"
@@ -20103,5 +20442,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "търговия на дребно"
@@ -20115,5 +20454,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "индустрия"
@@ -20127,5 +20466,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "индустриални развалини"
@@ -20139,5 +20478,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "зелена площ"
@@ -20151,5 +20490,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "ЖП"
@@ -20206,7 +20545,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "военни"
@@ -20220,5 +20559,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "гробище"
@@ -20231,5 +20570,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "връх"
@@ -20244,5 +20583,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "ледник"
@@ -20256,5 +20595,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "вулкан"
@@ -20269,4 +20608,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20308,7 +20648,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "природа"
@@ -20322,5 +20663,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "храсталак"
@@ -20334,5 +20675,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "пустош"
@@ -20346,5 +20687,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "гора"
@@ -20358,5 +20699,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "кал"
@@ -20370,5 +20711,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "плаж"
@@ -20446,8 +20787,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "маршрут"
@@ -20495,7 +20836,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "граница"
@@ -20637,10 +20978,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "място"
@@ -20681,6 +21022,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "адрес"
@@ -20962,203 +21310,51 @@
 msgstr "Улици NRW Geofabrik.de"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "Ако вашия GPS приемник съхранява точки прекалено рядко, включете тази "
-#~ "опция, за да се съединяват точките с линии."
-
-#~ msgid "Navigate"
-#~ msgstr "Навигирай"
-
-#~ msgid "Navigator"
-#~ msgstr "Навигатор"
-
-#~ msgid "Set start/end for routing. Middle mouse button to reset."
-#~ msgstr ""
-#~ "Посочете начало/край за маршрутизиране. Средния бутон на мишката за "
-#~ "нулиране."
-
-#~ msgid "Reset Graph"
-#~ msgstr "Нулиране на графа"
-
-#~ msgid "Provides navigation/autorouting functionality"
-#~ msgstr "Предоставя навигация/авторутираща функционалност"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Моля, изберете нещо от списъка с конфликти."
-
-#~ msgid "Please select a color."
-#~ msgstr "Моля, изберете цвят"
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Не пускай в пълноекранен режим"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Новости за JOSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Щракнете за да създадете нов път към съществуваща точка."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Щракнете за да съедините със съществуваща точка."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Щракнете за да добавите нова точка и създадете нов път."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Щракнете за да вмъкнете точка и направите съединение."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "Това е базов редактор за релации, който позволява да променяте маркерите "
-#~ "на релацията и нейните членове. В допълнение на това ще е хубаво да имаме "
-#~ "\"умен\" редактор, разбиращ от типа на релациите и ограничаващ избора по "
-#~ "подходящ начин."
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Качи този маршрут"
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Тази функционалност беше добавена наскоро. Моля<br>използвайте "
-#~ "внимателно и проверявайте дали работи както се очаква.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Качване на следа, филтрирана от JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Качване необработен файл: "
-
-#~ msgid "Description:"
-#~ msgstr "Описание:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Маркери (ключови думи в GPX):"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "GPX-Качване"
-
-#~ msgid "time"
-#~ msgstr "време"
-
-#~ msgid "desc"
-#~ msgstr "опис."
-
-#~ msgid "symbol"
-#~ msgstr "символ"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Качване необработен файл: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Маркери:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "Изберете нюанс на цвета в зависимост на скоростта в точката."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Редактирай магистрален изход"
-
-#~ msgid "Exit Number"
-#~ msgstr "Номер на магистрален изход"
-
-#~ msgid "Exit Name"
-#~ msgstr "Название на магистрален изход"
-
-#~ msgid "Waterway"
-#~ msgstr "Водоеми"
-
-#~ msgid "Information point"
-#~ msgstr "Информационен пункт"
-
-#~ msgid "Provider"
-#~ msgstr "Доставчик"
-
-#~ msgid "political"
-#~ msgstr "политическа"
-
-#~ msgid "National_park"
-#~ msgstr "Национален парк"
-
-#~ msgid "Natural"
-#~ msgstr "Естествено"
-
-#~ msgid "Add Site"
-#~ msgstr "Добавяне сайт"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Изтрийте сайт(ове)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Моля изберете сайт за изтриване."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Проверете сайт(ове)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Моля изберете сайт(ове) за проверка за обновления."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Добавяне нов сайт за разширения."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Изтриване на избраните сайт(ове) от списъка."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr "Провери избраните сайт(ове) за нови разширения или обновления."
-
-#~ msgid "Update Sites"
-#~ msgstr "Обнови сайтовете"
-
-#~ msgid "Version"
-#~ msgstr "Версия"
-
-#~ msgid "Install"
-#~ msgstr "Инсталиране"
-
-#~ msgid "Signpost"
-#~ msgstr "Стълб с указателни табели"
-
-#~ msgid "office"
-#~ msgstr "офис"
-
-#~ msgid "guidepost"
-#~ msgstr "пост на пазачи"
-
-#~ msgid "Ref"
-#~ msgstr "Ref"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Update Site URL"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Невалиден URL"
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "Пътят \"{0}\" трябва да съдържа поне два възела."
-
-#~ msgid "Upload GPX track"
-#~ msgstr "Качване на GPX следа"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "Колко сгради има в този парцел?"
-
-#~ msgid "Update available"
-#~ msgstr "Налично е обновление"
-
-#~ msgid "Version Details:"
-#~ msgstr "Подробности за версията:"
-
-#~ msgid ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
-#~ msgstr ""
-#~ "Вашата: {2}; Текуща: {0}; <font style=\"font-size:x-small\">(последна "
-#~ "нетествана: {1} &#150; не препоръчвана)</font>"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Отвори..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Описание"
+
+#~ msgid "Commit comment"
+#~ msgstr "Коментар на съхранението"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Сървъра не поддържа управление на версиите"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Прехвърлянето прекъснато поради грешка (повторен опит след 5 сек):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Наистина ли искате да маркирате проблема като ''решен''?"
+
+#~ msgid "Navigation"
+#~ msgstr "Навигация"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "Премахване на възли от маршрут"
+
+#~ msgid "Start routing"
+#~ msgstr "Започни маршрутизиране"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Подвижен мост"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Редактирай подвижен мост"
+
+#~ msgid "Portcullis"
+#~ msgstr "Падаща решетка"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Редактирай падаща решетка"
+
+#~ msgid "Charge"
+#~ msgstr "Такса"
+
+#~ msgid "sports"
+#~ msgstr "спортни"
+
+#~ msgid "viaduct"
+#~ msgstr "виадукт"
Index: /applications/editors/josm/i18n/po/cs.po
===================================================================
--- /applications/editors/josm/i18n/po/cs.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/cs.po	(revision 14844)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-25 20:03+0000\n"
-"Last-Translator: fatbozz <Unknown>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-19 04:49+0000\n"
+"Last-Translator: hanoj <ehanoj@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "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-03-31 14:52+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Vytvářím hlavní grafické rozhraní ( GUI )"
@@ -34,40 +34,40 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:258
 msgid "The projection could not be read from preferences. Using EPSG:4326"
-msgstr "Nelze načíst proijekci z nastavení. Používám EPSG:4326"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Nápověda: některé změny vznikly nahráním nových dat na server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Neuložené změny"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Jsou zde neuložené změny. Zahodit změny a pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Uložit a ukončit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Neuložit změny a ukončit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -78,10 +78,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -92,4 +92,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -99,10 +100,10 @@
 msgstr "Zrušit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoruji zkomolenou URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -128,8 +129,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -270,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -319,5 +320,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
 msgid "layer"
-msgstr "vrstva"
+msgstr "vrstvu"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
@@ -404,6 +405,6 @@
 msgstr "Otočit a zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -411,20 +412,20 @@
 msgstr "Zadej hodnoty pro všechny konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Vyřešit konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Kombinovat {0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Všechny cesty byli prázdné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -524,5 +525,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -643,6 +644,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -651,6 +652,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -705,5 +706,5 @@
 #, java-format
 msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
+msgstr "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
@@ -778,9 +779,9 @@
 msgstr "Přesto sloučit"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 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:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -961,4 +962,7 @@
 "projection to get rid of this warning.<br>Do you want to continue?"
 msgstr ""
+"<html>Pužíváte EPSG:4326 projekci, což může vást<br>k nechtěným výsledkům "
+"při pravoúhlém zarovnávání.<br>Změňte vaši projekci pro zrušení tohoto "
+"varování.<br>Chcete pokračovat?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
@@ -1052,5 +1056,5 @@
 msgstr "Uložit aktuální data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1059,26 +1063,26 @@
 "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Není otevřený žádný dokument, není co uložit."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Prázdný dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Dokument neobsahuje žádná data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Přesto uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1088,32 +1092,32 @@
 "vyřešeny, jako by byly všechny odmítnuty. Pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Zamítnout konflikty a uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Uložit GPX soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Uložit OSM soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Nemohu zálohovat soubor."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Neznámá přípona souboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Během ukládání došlo k chybě."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Během obnovení zálohy došlo k chybě."
@@ -1169,18 +1173,18 @@
 msgstr "Zavřít"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Rozdělit cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Rozdělit cestu zvoleným uzlem"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Tento výběr nemůže být použit k rozdělení."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1189,5 +1193,5 @@
 msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1200,9 +1204,9 @@
 msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "Zvolené uzly nesdílejí stejnou cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1211,10 +1215,10 @@
 msgstr[2] "Označené cesty neobsahují vybrané uzly."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1224,5 +1228,5 @@
 "cesty.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1230,5 +1234,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1353,9 +1357,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
 msgid "Unselect All (Focus)"
-msgstr ""
+msgstr "Odznačit vše (Fokus)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
 msgid "Unselect All (Escape)"
-msgstr ""
+msgstr "Odznačit vše (Escape)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
@@ -1374,4 +1378,6 @@
 "No data to update found. Have you already opened or downloaded a data layer?"
 msgstr ""
+"Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou "
+"vrstvu?"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
@@ -1383,46 +1389,50 @@
 "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Nahrát do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Nahrát všechy změny na OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Objekty k přidání:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Objekty ke změnění:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Objekty ke smazání:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Napište stručný komentář ke změnám, které nahráváte na server:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Nahrát tyto úpravy?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Nahrát změny na server"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Žádné změny k nahrání."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Nahrávám data"
@@ -1607,31 +1617,33 @@
 msgstr "Nemůžu přidat uzel ležící mimo Zemi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Přidat uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Přidat uzel do cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Spojit existující cestu do uzlu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Přidat nový uzel do již existující cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Přidat uzel do cesty a spojit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Vytvořit nový uzel."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Vybrat uzel pod kurzorem."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1642,9 +1654,4 @@
 msgstr[2] "Vložit nový uzel do {0} cest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Vybrat uzel pod kurzorem."
-
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Start new way from last node."
@@ -1671,5 +1678,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248
 msgid "Extrude Way"
-msgstr ""
+msgstr "Vytáhnout cestu"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
@@ -1689,5 +1696,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267
 msgid "Drag a way segment to make a rectangle."
-msgstr ""
+msgstr "Táhni segmentem cesty a vytvoř obdelník."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
@@ -1721,4 +1728,5 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
+"Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
@@ -2062,5 +2070,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2130,5 +2138,5 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:82
 msgid "Please select which property changes you want to apply."
-msgstr ""
+msgstr "Prosím vyberte které změny vlastností chcete použít."
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:95
@@ -2256,5 +2264,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "železnice"
@@ -2277,127 +2285,127 @@
 msgstr[2] "{0} uzlů"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Cesta se stylem plochy není uzavřená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Cesta v multipolygonu ''{0}'' není uzavřena."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Prázdný prvek v relaci."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Odstraněn prvek ''{0}'' z relace."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s méně, než dvěmi body."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Nalezena více než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Nalezeno více cílových \"to\" cest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "Nalezen více než jeden \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznámá role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámý typ prvku pro ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Nenazezena příchozí cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Nenalezena odchozí cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "Nenalezen \"via\" uzel nebo cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Styl pro omezení {0} nenalezen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Ne-cesta ''{0}'' v multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Vnitřní cesta ''{0}'' je venku."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Styl pro vnější cestu ''{0}'' nesedí."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "nepopsaný"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "text"
@@ -2405,5 +2413,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2432,5 +2440,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "pozadí"
@@ -2492,5 +2500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2504,5 +2512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2533,14 +2541,14 @@
 msgstr "finální verze:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Zprávu dne není možné zobrazit"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+msgstr "- běžící verze je {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Stahuji zprávu dne"
@@ -2606,71 +2614,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Jméno uživatele"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Nelze najít překlad pro jazyk {0}. Vracím se k {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "použití"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Zobrazí tuto nápovědu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Standardní unixová geometrie okna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Stáhnout ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Otevřít soubor (jako GPS trasu, pokud .gpx)"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid "Download the bounding box as raw gps"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+msgid "Select with the given search"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Launch in maximized mode"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
-msgid "Download the bounding box as raw gps"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
-msgid "Select with the given search"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
-msgid "Launch in maximized mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Reset the preferences to default"
 msgstr "Nastavit výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Nastavit jazyk."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "příklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2680,23 +2688,28 @@
 "selection nejprve nahrajte nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Namísto --download=<bbox> můžete zadat osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Aktivuji aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Načítám dřívější pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Nastavuji výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Načítám pluginy"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2874,5 +2887,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3084,5 +3097,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Role"
@@ -3130,73 +3143,71 @@
 msgstr "Vlastnosti / Členství"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Aplikovat změny"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Vytvořit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Upravit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Upravit relaci #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Základní"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Obsazeno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Tagy (prázdná hodnota vymaže tag)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Členové"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Posunout nahoru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Přesunout zvolené prvky nahoru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Přidat vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Přidat všechny zvolené objekty mezi prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Odebrat označené"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Odebere všechny označené objekty z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Posunout dolů"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Přesunout zvolenou vrstvu o řádek dolů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3205,36 +3216,36 @@
 msgstr "Odstranit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Odstranit prvek v aktuálním řádku tabulky z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Stáhnout prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Členové: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editor relací: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Vznikly konflikty během importu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Chyba parsování odezvy serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Nemohu se připojit na server."
@@ -3248,10 +3259,11 @@
 msgstr "Smazat vybrané relace"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relace"
@@ -3444,5 +3456,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Místa"
@@ -3489,21 +3501,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "typ"
@@ -3554,10 +3566,7 @@
 msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Přehledová mapa"
@@ -3712,4 +3721,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3818,5 +3828,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3877,19 +3887,34 @@
 "byly vynechány."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "mimo stažený areál"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Verze {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skládá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} smazáno.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "použití"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Verze {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3897,21 +3922,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4337,5 +4362,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4420,4 +4445,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4501,7 +4528,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4514,7 +4538,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4530,10 +4561,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4702,5 +4733,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4734,7 +4767,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4818,4 +4851,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4868,4 +4909,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4874,7 +4921,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4883,15 +4927,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4916,129 +4949,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Název"
@@ -5087,12 +5122,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Nahrát všechny dlaždice"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zóna"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5120,45 +5153,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Auto"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Cyklisté"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5166,25 +5189,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Pěší"
@@ -5232,7 +5260,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Vykreslovat spojnice mezi GPS body"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5840,10 +5867,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, pravděpodobně chybí některé tagy."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Připravuji data..."
@@ -5853,25 +5880,75 @@
 msgstr "Chyba parsování: Chybná struktura GPX dokumentu"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Otevírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Zavírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Žádné změny k nahrání."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Připravuji..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Nahrávám..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Chyba parsování odezvy serveru"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Neznámé jméno počítače"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Nesprávné heslo nebo uživatelské jméno"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 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:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 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:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Zadejte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Přihlásit se"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5882,44 +5959,52 @@
 msgstr "Chyba během parsování"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Neznámá verze"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Neznámá verze"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Nalezen element <nd> mimo cestu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> má nulový ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Nalezen <member> tag mimo relaci."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletní <member> specifikace s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Chybí povinný atribut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Připravuji OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Neplatné id uzlu"
@@ -5929,5 +6014,5 @@
 msgstr "Kontaktuji server..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -5936,5 +6021,5 @@
 "internetu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5944,55 +6029,8 @@
 "oblast."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Napište stručný komentář ke změnám, které nahráváte na server:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Poslat komentář"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), zbývá {3} . Nahrávám {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Stala se chyba : {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Otevírám sadu změn..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Server nepodporuje sady změn"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Neznámé jméno počítače"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Připravuji..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Nahrávám..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Zavírám sadu změn..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6162,6 +6200,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "neznámý"
@@ -6343,7 +6381,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Vytvořit plochy"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6362,7 +6399,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Vytvořit plochy"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6386,5 +6422,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Popis"
@@ -7646,7 +7682,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "voda"
@@ -7743,4 +7779,7 @@
 "<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 msgstr ""
+"Přesnost Douglas-Peuckerova generalizace linie, hodnota ve stupních."
+"<br>Nižší hodnoty vracejí více uzlů s menším zjednodušením. Výchozí hodnota "
+"0.0003."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
@@ -7948,5 +7987,5 @@
 msgstr "Stahovací smyčka OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Zobrazuje chyby z OpenStreetBugs"
@@ -7965,4 +8004,11 @@
 msgstr "Varování"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Stala se chyba : {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7990,35 +8036,38 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Přidat komentář"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Zadejte váš komentář"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Označit jako hotové"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Opravdu označit tento problém jako \"hotový\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Opravdu uzavřít?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Nový problém"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Vytvořit problém"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Podrobně popište problém"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Vytvořit problém"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8047,5 +8096,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8055,9 +8104,9 @@
 "mapy v nastavení."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "nastavení osmarenderu"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Spustitelný soubor Firefoxu"
@@ -8128,95 +8177,76 @@
 msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr ""
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
+msgid "Click to add destination."
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Routing"
-msgstr "Nic"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-#, fuzzy
-msgid "Click to add route nodes."
-msgstr "Klikni pro vložení nového uzlu."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-#, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Klikni pro vložení nového uzlu."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Odstraňuji duplicitní uzly..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Otevřít seznam všech relací"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Stanice"
+msgid "Add routing layer"
+msgstr "Přidat novou vrstvu"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "střední"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Obuv"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Rychleji"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Otočit cesty"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Přívoz"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Nastavení pluginu WMS Plugin"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Nastavení webů s pluginy"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Výjezd z dálnice"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Max. rychlost (km/h)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Výška"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8224,33 +8254,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Aktuální mapa"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Nahrát dlaždici"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Zobrazit stav dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Vyžádat aktualizaci"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Nahrát všechny dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Zvětšit přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Zmenšit přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "obrázek nebyl nahrán"
@@ -8273,34 +8303,34 @@
 msgstr "Nastavení pro plugin SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Zdroj dlaždic"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Automatické přiblížení: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Automaticky stahovat dlaždice: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Max. úroveň přiblížení: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Ztlumit pozadí: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "chyba při nahrávání metadat"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "požadováno: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "chyba při poždavku na aktualizaci"
@@ -8315,5 +8345,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8370,7 +8400,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Upravit stát"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8385,12 +8414,10 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "nic"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "zvýraznit"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -8398,19 +8425,17 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Změnit vlastnosti až  {0} objektu."
-msgstr[1] "Změnit vlastnosti až  {0} objektů."
-msgstr[2] "Změnit vlastnosti až  {0} objektů."
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Změnit vlastnosti až  {0} objektu."
-msgstr[1] "Změnit vlastnosti až  {0} objektů."
-msgstr[2] "Změnit vlastnosti až  {0} objektů."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -8419,25 +8444,21 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Potok"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Hledat"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Soubor"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Auto"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8521,5 +8542,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Jméno ulice"
@@ -8626,17 +8647,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relace"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Spojit překrývající se plochy"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Spojit překrývající se plochy"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8649,12 +8667,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Spojení konfliktů"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Odstranit z relace"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8663,7 +8679,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Neuzavřené cesty."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
@@ -8672,7 +8687,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Křižovatka dálnic"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9266,4 +9280,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9345,7 +9365,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "budova"
@@ -9359,5 +9379,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "oblast"
@@ -9636,4 +9656,9 @@
 msgstr ""
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9660,7 +9685,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Vytvořit plochy"
+msgstr "Plugin Vytvořit pravidelné sítě cest"
 
 #. Plugin DirectUpload
@@ -9674,5 +9698,5 @@
 #: build/trans_plugins.java:13
 msgid "Duplicate Ways with an offset"
-msgstr ""
+msgstr "Plugin Duplikovat_cestu"
 
 #. Plugin editgpx
@@ -9751,21 +9775,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9774,15 +9805,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9792,15 +9823,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9809,5 +9840,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9816,5 +9847,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9823,5 +9854,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9911,5 +9942,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr ""
@@ -9964,7 +9995,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Vrstva"
@@ -10007,5 +10038,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Max. rychlost (km/h)"
@@ -10053,5 +10084,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Jednosměrka"
@@ -10107,5 +10138,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -10155,5 +10186,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunel"
@@ -10200,5 +10231,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Zářez"
@@ -10245,5 +10276,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Násep"
@@ -10253,5 +10284,5 @@
 #: build/trans_presets.java:67
 msgid "Motorway Link"
-msgstr "Dálniční spojka"
+msgstr "Dálnice - nájezd, rampa, kolektor"
 
 #. item
@@ -10266,5 +10297,5 @@
 #: build/trans_presets.java:84
 msgid "Trunk"
-msgstr "Silnice pro motorová vozidla"
+msgstr "4. pruhová silnice"
 
 #. item
@@ -10273,5 +10304,5 @@
 #: build/trans_presets.java:87
 msgid "Edit Trunk"
-msgstr "Upravit silnici pro motorová vozidla"
+msgstr "Upravit 4. pruhovou silnice"
 
 #. item "Streets/Trunk" check "Embankment"
@@ -10279,5 +10310,5 @@
 #: build/trans_presets.java:103
 msgid "Trunk Link"
-msgstr "Nájezd silnice pro motorová vozidla"
+msgstr "4. pruhová silnice - nájezd"
 
 #. item
@@ -10286,5 +10317,5 @@
 #: build/trans_presets.java:106
 msgid "Edit Trunk Link"
-msgstr "Upravit nájezd silnice pro motorová vozidla"
+msgstr "Upravit 4. pruhovou silnici - nájezd"
 
 #. item "Streets/Trunk Link" check "Embankment"
@@ -10310,5 +10341,5 @@
 #: build/trans_presets.java:141
 msgid "Primary Link"
-msgstr "Spojka silnice 1. třídy"
+msgstr "Silnice 1. třídy - nájezd"
 
 #. item
@@ -10401,6 +10432,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Šířka (metrů)"
@@ -10449,5 +10480,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Povrch"
@@ -10479,5 +10510,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "zpevněný"
@@ -10488,5 +10519,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "nezpevněný"
@@ -10500,5 +10531,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "dlažební kostky"
@@ -10549,5 +10580,5 @@
 #: build/trans_presets.java:257
 msgid "parking_aisle"
-msgstr ""
+msgstr "Obslužná silnice na parkovišti"
 
 #. item "Streets/Service" text "Width (meters)"
@@ -10555,5 +10586,5 @@
 #: build/trans_presets.java:270
 msgid "Parking Aisle"
-msgstr ""
+msgstr "Obslužná silnice na parkovišti"
 
 #. item
@@ -10563,5 +10594,5 @@
 #: build/trans_presets.java:274
 msgid "Edit Parking Aisle"
-msgstr ""
+msgstr "Editovat obslužnou silnici na parkovišti"
 
 #. </optional>
@@ -10650,5 +10681,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10669,6 +10700,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "ano"
@@ -10812,7 +10843,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "ne"
@@ -10826,73 +10857,63 @@
 msgstr "Nákladní vozidlo"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Kůň"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motocykl"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
@@ -10967,130 +10988,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Typ"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11098,5 +11007,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11104,11 +11013,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11116,5 +11019,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11122,5 +11025,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11128,5 +11031,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11134,6 +11037,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11152,6 +11061,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "dálnice"
@@ -11159,5 +11068,5 @@
 #: build/trans_presets.java:334
 msgid "motorway_link"
-msgstr "dálniční spojka"
+msgstr "Dálnice - nájezd"
 
 #. color motorway
@@ -11177,12 +11086,12 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
-msgstr "silnice pro motorová vozidla"
+msgstr "4. pruhová silnice"
 
 #: build/trans_presets.java:334
 msgid "trunk_link"
-msgstr "spojka silnice pro motorová vozidla"
+msgstr "4. pruhová silnice - nájezd"
 
 #. color trunk
@@ -11202,6 +11111,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "silnice první třídy"
@@ -11209,5 +11118,5 @@
 #: build/trans_presets.java:334
 msgid "primary_link"
-msgstr "spojka silnice první třídy"
+msgstr "Silnice 1. třídy - nájezd"
 
 #. color primary
@@ -11227,6 +11136,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "silnice druhé třídy"
@@ -11240,5 +11149,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "silnice třetí třídy"
@@ -11256,5 +11165,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr ""
@@ -11272,5 +11181,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr ""
@@ -11297,6 +11206,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "konstrukce"
@@ -11325,5 +11234,5 @@
 #: build/trans_presets.java:379
 msgid "Construction"
-msgstr "Stavba"
+msgstr "Výstavba, plánovaná výstavba (Construction)"
 
 #. item
@@ -11337,6 +11246,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11347,5 +11255,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -11423,5 +11331,5 @@
 #: build/trans_presets.java:498
 msgid "Track"
-msgstr "Vozová cesta"
+msgstr "Vozová cesta (track)"
 
 #. item
@@ -11526,5 +11434,5 @@
 #: build/trans_presets.java:624
 msgid "Path"
-msgstr "cesta"
+msgstr "Cesta vychozená v terénu pro cyklo/pěší (path)"
 
 #. item
@@ -11547,5 +11455,5 @@
 #: build/trans_presets.java:651
 msgid "Hiking"
-msgstr ""
+msgstr "turistická stezka"
 
 #. item
@@ -11555,5 +11463,5 @@
 #: build/trans_presets.java:655
 msgid "Edit Hiking"
-msgstr ""
+msgstr "Editovat turistickou stezka"
 
 #. item "Ways/Hiking" text "Width (meters)"
@@ -11561,5 +11469,5 @@
 #: build/trans_presets.java:664
 msgid "Mountain Hiking"
-msgstr ""
+msgstr "horská turistická stezka"
 
 #. item
@@ -11569,5 +11477,5 @@
 #: build/trans_presets.java:668
 msgid "Edit Mountain Hiking"
-msgstr ""
+msgstr "Editovat horskou stezka"
 
 #. item "Ways/Mountain Hiking" text "Width (meters)"
@@ -11575,5 +11483,5 @@
 #: build/trans_presets.java:677
 msgid "Demanding Mountain Hiking"
-msgstr ""
+msgstr "Náročná horská stezka"
 
 #. item
@@ -11583,5 +11491,5 @@
 #: build/trans_presets.java:681
 msgid "Edit Demanding Mountain Hiking"
-msgstr ""
+msgstr "Editovat náročnou horskou stezku"
 
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
@@ -11589,5 +11497,5 @@
 #: build/trans_presets.java:690
 msgid "Alpine Hiking"
-msgstr ""
+msgstr "Alpská stezka"
 
 #. item
@@ -11597,5 +11505,5 @@
 #: build/trans_presets.java:694
 msgid "Edit Alpine Hiking"
-msgstr ""
+msgstr "Editovat alpskou stezku"
 
 #. item "Ways/Alpine Hiking" text "Width (meters)"
@@ -11603,5 +11511,5 @@
 #: build/trans_presets.java:703
 msgid "Demanding Alpine Hiking"
-msgstr ""
+msgstr "Náročná alpská stezka"
 
 #. item
@@ -11611,5 +11519,5 @@
 #: build/trans_presets.java:707
 msgid "Edit Demanding Alpine Hiking"
-msgstr ""
+msgstr "Editovat náročnou alpskou stezku"
 
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
@@ -11636,5 +11544,5 @@
 #: build/trans_presets.java:731
 msgid "Motorway Junction"
-msgstr "Křižovatka dálnic"
+msgstr "Dálniční sjezd (exit)"
 
 #. item
@@ -11652,5 +11560,5 @@
 #: build/trans_presets.java:739
 msgid "Services"
-msgstr ""
+msgstr "Služby motoristům (odpočívadla)"
 
 #. item
@@ -11689,14 +11597,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Operátor"
@@ -11721,20 +11629,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "ostrov"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11742,5 +11650,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "Přechod na koni"
@@ -11749,5 +11657,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "Přechod na kole"
@@ -11757,5 +11665,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11835,5 +11743,5 @@
 #: build/trans_presets.java:782
 msgid "Turning Circle"
-msgstr ""
+msgstr "Obratiště"
 
 #. item
@@ -11904,10 +11812,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr ""
@@ -11920,29 +11829,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Sloupek"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Upravit sloupek"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11951,7 +11849,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11960,69 +11861,54 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Povolený provoz:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Sloupek"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr ""
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
 #: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Upravit sloupek"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Padací most"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Upravit padací most"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
 msgid "Bus Trap"
 msgstr ""
@@ -12030,36 +11916,87 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Mýtná budka"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Upravit mýtnou budku"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
 #: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr ""
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr ""
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Upravit zkratky"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+msgid "Border Control"
+msgstr "Hraniční kontrola"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Upravit hraniční kontrolu"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Plot"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Zeď"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Městské hradby"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Vstup"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Upravit vstup"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "Brána"
@@ -12067,128 +12004,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr "Závora"
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr "Upravit závoru"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Plot"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Zeď"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Městské hradby"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Mýtná budka"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Upravit mýtnou budku"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Hraniční kontrola"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Upravit hraniční kontrolu"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Vstup"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Upravit vstup"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Vodní plocha"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Pramen"
@@ -12196,5 +12085,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Upravit pramen"
@@ -12202,16 +12091,16 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
-msgstr ""
+msgstr "Odvodňovací kanál, meliorace"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
-msgstr ""
+msgstr "Editovat odvodňovací kanál, meliorace"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Potok"
@@ -12219,10 +12108,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Upravit potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Plavební kanál"
@@ -12230,10 +12119,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Upravit plavební kanál"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Řeka"
@@ -12243,5 +12132,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Upravit řeku"
@@ -12249,15 +12138,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Upravit vodní plochu"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Země (souš)"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Upravit plochu země"
@@ -12265,15 +12154,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Vodní nádrž"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Upravit vodní nádrž"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr ""
@@ -12281,15 +12170,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -12297,5 +12186,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Břeh řeky"
@@ -12304,10 +12193,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Upravit břeh řeky"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Mokřina"
@@ -12318,56 +12207,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Upravit mokřinu"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "bažina"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "močál"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "mokřina"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "slanisko"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Bahno"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Upravit bahno"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Pláž"
@@ -12375,20 +12264,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Upravit pláž"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Zátoka"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Upravit zátoku"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Útes"
@@ -12396,10 +12285,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Upravit útes"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Linie pobřeží"
@@ -12407,5 +12296,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Upravit linii pobřeží"
@@ -12413,5 +12302,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Přívoz"
@@ -12419,5 +12308,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Upravit přívoz"
@@ -12426,5 +12315,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr ""
@@ -12432,10 +12321,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Dok"
@@ -12443,5 +12332,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Upravit dok"
@@ -12449,21 +12338,21 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
-msgstr "Přehrada"
+msgstr "Hráz přehrady"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Upravit přehradu"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Vodní objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr ""
@@ -12472,5 +12361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Jez"
@@ -12478,20 +12367,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Upravit jez"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Upravit vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr ""
@@ -12500,15 +12389,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Přístav"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Upravit přístav"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Molo"
@@ -12516,10 +12405,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Upravit molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Přístaviště přívozu"
@@ -12527,10 +12416,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Upravit přístaviště přivozu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr ""
@@ -12540,5 +12429,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr ""
@@ -12546,10 +12435,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Železnice"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Železnice"
@@ -12557,5 +12446,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Upravit železnici"
@@ -12585,8 +12474,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Volitelné typy"
@@ -12600,35 +12489,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnice"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upravit úzkorozchodnou železnici"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Monorail"
@@ -12636,45 +12525,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Upravit monorail"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Upravit metro"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Tramvaj"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Upravit tramvaj"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr ""
@@ -12682,5 +12571,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -12689,14 +12578,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnice"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Upravit nepoužívanou železnici"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Opuštěná železnice"
@@ -12705,5 +12594,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "železniční přejezd"
@@ -12712,7 +12601,7 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
-msgstr ""
+msgstr "Železniční přechod pro chodce"
 
 #. item
@@ -12720,11 +12609,11 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
-msgstr ""
+msgstr "Druh křížení"
 
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Točna"
@@ -12733,10 +12622,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Lanovky"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -12744,10 +12633,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Upravit sedačkovou lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Lyžařský vlek"
@@ -12755,10 +12644,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Upravit lyžařský vlek"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Kabinková lanovka"
@@ -12766,24 +12655,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Upravit kabinkovou lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Upravit Golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Stanice"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Upravit stanici"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Čerpací stanice"
@@ -12793,5 +12695,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Upravit čerpací stanici"
@@ -12807,5 +12709,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12815,5 +12717,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Upravit parkoviště"
@@ -12821,40 +12723,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Kapacita"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "povrchové"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "vícepodlažní"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "podzemní"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "park and ride"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Místa pro vozíčkáře"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Poplatek"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Myčka"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Upravit myčku aut"
@@ -12862,5 +12765,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Obchod"
@@ -12868,15 +12771,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Upravit obchod s auty"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Opravna"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Upravit autoopravnu"
@@ -12884,5 +12787,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Půjčovna"
@@ -12891,10 +12794,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Upravit půjčovnu aut"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Sdílení"
@@ -12902,5 +12805,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "̈́Upravit sdílení aut"
@@ -12908,5 +12811,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Upravit parkoviště pro kola."
@@ -12915,5 +12818,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Upravit půjčovnu kol"
@@ -12922,15 +12825,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Upravit prodejnu kol"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -12938,5 +12841,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Železniční zastávka"
@@ -12944,5 +12847,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Upravit železniční zastávku"
@@ -12950,5 +12853,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Tramvajová zastávka"
@@ -12957,5 +12860,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Upravit tramvajovou zastávku"
@@ -12963,5 +12866,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Železniční nástupiště"
@@ -12970,5 +12873,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Upravit železniční nástupiště"
@@ -12980,5 +12883,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr ""
@@ -12986,10 +12889,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -12998,10 +12901,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Upravit vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr ""
@@ -13010,5 +12913,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Autobusové nádraží"
@@ -13017,5 +12920,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Upravit autobusové nádraží"
@@ -13023,5 +12926,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Zastávka autobusu"
@@ -13031,5 +12934,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Upravit zastávku autobusu"
@@ -13037,10 +12940,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Nástupiště autobusu"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Upravit nástupiště autobusu"
@@ -13048,5 +12951,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr ""
@@ -13054,5 +12957,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr ""
@@ -13060,5 +12963,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Letiště"
@@ -13066,15 +12969,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Upravit letiště"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13083,5 +12986,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Ubytování"
@@ -13093,5 +12996,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -13100,15 +13003,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Upravit hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motel"
@@ -13116,20 +13019,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Upravit motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Penzion"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Horská chata"
@@ -13137,10 +13040,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Upravit horskou chatu"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Hostel"
@@ -13148,30 +13051,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Upravit hostel"
 
 #. item "Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1560
+msgid "Alpine Hut"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1561
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1566
+msgid "Caravan Site"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1567
-msgid "Alpine Hut"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1568
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
-msgid "Caravan Site"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1574
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Tábořiště"
@@ -13179,10 +13082,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Upravit tábořiště"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
@@ -13193,5 +13096,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurace"
@@ -13199,5 +13102,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Upravit restauraci"
@@ -13205,5 +13108,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Kuchyně"
@@ -13211,61 +13114,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italská"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Občerstvení"
@@ -13273,9 +13176,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Upravit občerstvení"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Kavárna"
@@ -13283,10 +13186,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Upravit kavárnu"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Hospoda"
@@ -13294,20 +13197,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Upravit hospodu"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1613
+msgstr "Hospoda-zahrádka"
+
+#. item
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
-msgstr ""
+msgstr "Editovat hospoda-zahrádka"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "Bar"
@@ -13315,10 +13218,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "Upravit bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -13326,20 +13229,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Upravit noční klub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
@@ -13348,22 +13251,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Otevírací doba"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "Muzeum"
@@ -13371,10 +13263,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "Upravit muzeum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "Zoo"
@@ -13383,10 +13275,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "Upravit zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -13394,25 +13286,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr "Zábavní park"
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "Umělecké dílo"
@@ -13420,5 +13312,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr "Upravit umělecké dílo"
@@ -13426,77 +13318,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
-msgstr ""
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr "Turistické informační centrum"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
+msgstr "Editovat turistické informační centrum"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr "Typ mapy"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "plán města"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "turistická mapa"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "cyklistická mapa"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr "Bližší popis"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Přístřešek"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Upravit přístřešek"
@@ -13504,47 +13408,47 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Ohniště"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Místo na piknik"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Upravit místo na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
-msgstr "Zámek"
+msgstr "Zámek/Hrad"
 
 #. item
 #. <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:1715
+msgid "Edit Castle"
+msgstr "Upravit zámek/hrad"
+
+#. item "Historic Places/Castle" text "Name"
 #: build/trans_presets.java:1719
-msgid "Edit Castle"
-msgstr "Upravit zámek"
-
-#. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
 msgid "Ruins"
-msgstr "Ruiny"
-
-#. item
+msgstr "Zřícenina"
+
+#. item
+#: build/trans_presets.java:1720
+msgid "Edit Ruins"
+msgstr "Upravit zříceninu"
+
+#. item "Historic Places/Ruins" text "Name"
 #: build/trans_presets.java:1724
-msgid "Edit Ruins"
-msgstr "Upravit ruiny"
-
-#. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -13553,20 +13457,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Upravit archeologické naleziště"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Bojiště"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Upravit bojiště"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Památník"
@@ -13574,56 +13490,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Bojiště"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Upravit bojiště"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
-msgstr "Boží muka"
-
-#. item
-#: build/trans_presets.java:1758
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
-msgstr ""
+msgstr "Editovat boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Hřiště"
@@ -13631,15 +13536,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
@@ -13647,15 +13552,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -13669,6 +13574,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -13747,4 +13652,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14036,28 +13949,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "sport"
@@ -14067,227 +13981,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "lezení"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr ""
@@ -14326,191 +14240,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "hřiště"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "sportovní centrum"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Cyklistika"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Lyžování"
@@ -14518,56 +14432,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "pro začátečníky"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "jednoduchá"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "střední"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "pro pokročilé"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "pro experty"
 
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "Střelba"
@@ -14575,178 +14491,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Upravit pelotu"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Upravit ragby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Budovy"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Budova"
@@ -14754,5 +14670,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -14760,10 +14676,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Radnice"
@@ -14771,10 +14687,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -14782,10 +14698,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Soud"
@@ -14794,10 +14710,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Vězení"
@@ -14806,10 +14722,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Policie"
@@ -14819,10 +14735,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -14831,10 +14747,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Pošta"
@@ -14842,5 +14758,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -14848,15 +14764,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Škola"
@@ -14864,10 +14780,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Vysoká škola"
@@ -14875,10 +14791,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Střední škola"
@@ -14886,5 +14802,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -14892,5 +14808,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Kino"
@@ -14899,10 +14815,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Knihovna"
@@ -14911,10 +14827,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr ""
@@ -14922,10 +14838,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Divadlo"
@@ -14934,10 +14850,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Chrám(kostel, kaple, synagoga, mešita...)"
@@ -14947,5 +14863,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -14954,6 +14870,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Náboženství"
@@ -14962,66 +14878,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
+msgstr "italská"
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Vyznání"
@@ -15030,81 +14947,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "ortodoxní"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Adresy"
@@ -15113,5 +15030,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Upravit informace o adrese"
@@ -15119,5 +15036,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Číslo domu"
@@ -15125,20 +15042,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Kód země"
@@ -15146,5 +15063,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -15153,5 +15070,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Upravit interpolaci adres"
@@ -15159,67 +15076,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "všechny"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "atletika"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Konstrukce"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Továrna"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Věž"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Maják"
@@ -15227,10 +15149,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -15238,10 +15160,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -15249,10 +15171,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -15262,10 +15184,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Jeřáb"
@@ -15273,21 +15195,21 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
-msgstr ""
+msgstr "Vodní bój"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
-msgstr ""
+msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr ""
@@ -15295,10 +15217,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -15306,5 +15228,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
@@ -15312,5 +15234,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -15320,39 +15242,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "sluneční"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "plynová"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -15361,10 +15283,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -15373,5 +15295,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -15379,10 +15301,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -15393,5 +15315,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
@@ -15399,5 +15321,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -15406,25 +15328,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Napětí"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Počet drátů"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Záchody"
@@ -15432,25 +15354,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr ""
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr ""
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telefon"
@@ -15459,5 +15376,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -15465,5 +15382,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Mince"
@@ -15471,5 +15388,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Bankovky"
@@ -15477,5 +15394,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -15483,5 +15400,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -15489,15 +15406,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr ""
@@ -15506,5 +15423,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr ""
@@ -15512,35 +15429,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Lavička"
@@ -15549,20 +15466,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr ""
@@ -15570,22 +15487,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Fontána"
@@ -15594,10 +15511,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -15606,10 +15523,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -15617,25 +15534,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Upravit supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr ""
@@ -15643,10 +15560,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -15654,10 +15571,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Upravit kiosek"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -15665,5 +15582,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Upravit prodejní automat"
@@ -15671,88 +15588,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "lístky městské hromadné dopravy"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Řeznictví"
@@ -15760,10 +15677,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Upravit řeznictví"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Pekařství"
@@ -15771,10 +15688,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Upravit pekařství"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Květinářství"
@@ -15782,70 +15699,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Upravit květinářství"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Škola"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Upravit obchod s obuví"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Upravit obchod s nápoji"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Počítače"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Upravit obchod s počítači"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Upravit obchod s elektronikou"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Upravit obchod s hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Nábytek"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Upravit obchod s nábytkem"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Zahradní centrum"
@@ -15853,10 +15784,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Upravit zahradní centrum"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -15864,10 +15795,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -15875,60 +15806,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Kadeřnictví"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Upravit Kadeřnictví"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Obuv"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuví"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Hračky"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Upravit obchod s hračkami"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Čistírna"
@@ -15936,10 +15867,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Upravit čistírnu"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Prádelna"
@@ -15947,10 +15878,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Upravit prádelnu"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr ""
@@ -15958,35 +15889,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "Sportovní potřeby"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Sport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Upravit obchod se sportovními pořebami"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "Optika"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Upravit optiku"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Banka"
@@ -15994,5 +15927,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Upravit banku"
@@ -16000,10 +15933,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -16011,5 +15944,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Upravit směnárnu"
@@ -16017,15 +15950,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr ""
@@ -16033,20 +15966,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -16054,5 +15987,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Upravit lékárnu"
@@ -16060,10 +15993,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -16071,10 +16004,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr ""
@@ -16083,5 +16016,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -16090,20 +16023,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Telefonní číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -16111,5 +16044,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -16118,25 +16051,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Země"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Upravit zemi"
@@ -16144,45 +16077,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Stát"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Upravit stát"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Oblast"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Upravit oblast"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr ""
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Město"
@@ -16190,10 +16124,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Upravit město"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Čtvrť"
@@ -16201,41 +16135,42 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Upravit čtvrť"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Obec"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
-msgstr ""
+msgstr "Místní název"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
-msgstr ""
+msgstr "Editovat místní název"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Ostrov"
@@ -16243,5 +16178,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Upravit ostrov"
@@ -16249,5 +16184,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -16255,10 +16190,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Upravit vstup do jeskyně"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Vrchol"
@@ -16266,10 +16201,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Upravit vrchol"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Ledovec"
@@ -16277,10 +16212,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Upravit ledovec"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Sopka"
@@ -16288,70 +16223,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Upravit sopku"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Národní"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
-msgstr ""
+msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Strom"
@@ -16360,40 +16295,40 @@
 #. <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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
-msgstr ""
+msgstr "Prales"
 
 #. item
 #. <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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
-msgstr ""
+msgstr "Editovat Prales"
 
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "jehličnatý"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Les"
@@ -16402,19 +16337,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Upravit lesní plochu"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Podrost"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Upravit podrost"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Vřesoviště"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Upravit vřesoviště"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Farma"
@@ -16423,70 +16402,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "Louka"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Tráva"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16494,10 +16474,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr ""
@@ -16505,20 +16485,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr ""
@@ -16526,5 +16506,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -16532,15 +16512,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Rezidenční čtvrť"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Hřbitov"
@@ -16548,9 +16528,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -16558,39 +16538,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr ""
@@ -16598,114 +16578,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Vojenský prostor"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Upravit vojenský prostor"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Nezastavěné území (Greenfield)"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr ""
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Výstavba"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr ""
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Lom"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Vojenský prostor"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Upravit vojenský prostor"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Podrost"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Upravit podrost"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Vřesoviště"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Upravit vřesoviště"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -16715,5 +16652,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -16722,10 +16659,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "vnější část"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -16733,5 +16670,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -16740,5 +16677,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -16746,34 +16683,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -16782,15 +16719,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "na cestu"
@@ -16798,5 +16735,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Trasa"
@@ -16805,5 +16742,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -16811,5 +16748,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Typ trasy"
@@ -16881,24 +16818,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "bicykl"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "lyžařská"
@@ -16943,4 +16880,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16950,19 +16890,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "pěší"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "turistická"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "objízdná"
@@ -16976,10 +16917,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -16987,26 +16928,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -17015,30 +16956,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "zpětná zastávka"
@@ -17222,4 +17163,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17231,4 +17279,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17330,11 +17387,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "zastaralý"
@@ -17376,7 +17435,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "koňská"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Bariéry"
 
 #. color tertiary
@@ -17412,6 +17686,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "ulice"
@@ -17467,7 +17741,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "dálnice"
@@ -17514,108 +17788,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "železnice"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viadukt"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17632,4 +17819,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "Služby motoristům (odpočívadla)"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17639,4 +17832,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Brod"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17653,6 +17852,19 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
 msgstr ""
 
@@ -17666,5 +17878,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "říční břeh"
@@ -17678,5 +17890,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "potok"
@@ -17690,5 +17902,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr ""
@@ -17716,5 +17928,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr ""
@@ -17729,4 +17941,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17766,5 +17979,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17881,12 +18094,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr ""
@@ -17932,5 +18146,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17948,7 +18162,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17971,10 +18185,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -18004,6 +18218,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -18048,6 +18262,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -18061,5 +18275,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminál"
@@ -18081,5 +18295,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -18093,5 +18307,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -18114,4 +18328,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18131,4 +18353,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "lanovka"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18137,23 +18365,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "lanovka"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "lehká sjezdovka"
@@ -18167,5 +18382,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "střední sjezdovka"
@@ -18179,5 +18395,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "těžká sjezdovka"
@@ -18190,6 +18407,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "pro experty"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18203,5 +18435,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "sjezdovka pro začátečníky"
@@ -18232,4 +18465,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18264,4 +18505,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18274,8 +18539,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr ""
@@ -18288,5 +18555,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "molo"
@@ -18300,5 +18570,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "potrubí"
@@ -18426,12 +18696,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr ""
@@ -18445,5 +18715,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr ""
@@ -18515,8 +18785,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18552,4 +18822,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18609,11 +18887,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18752,6 +19030,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18978,22 +19277,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -19025,6 +19324,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -19060,4 +19359,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19077,7 +19384,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "zdravotnictví"
@@ -19171,4 +19479,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19371,4 +19687,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19402,28 +19734,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "obchod"
@@ -19477,4 +19811,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19487,8 +19829,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotel"
@@ -19543,4 +19885,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19637,9 +19980,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "turistika"
@@ -19711,8 +20054,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr ""
@@ -19782,9 +20125,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr ""
@@ -19798,5 +20141,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "lom"
@@ -19810,5 +20153,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr ""
@@ -19830,5 +20173,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr ""
@@ -19842,5 +20185,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "les"
@@ -19854,5 +20197,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -19875,5 +20218,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr ""
@@ -19887,5 +20230,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr ""
@@ -19899,5 +20242,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19911,5 +20254,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -19923,5 +20266,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -19978,7 +20321,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr ""
@@ -19992,5 +20335,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "hřbitov"
@@ -20003,5 +20346,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "vrchol"
@@ -20016,5 +20359,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "ledovec"
@@ -20028,5 +20371,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "sopka"
@@ -20041,4 +20384,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20080,7 +20424,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr ""
@@ -20094,5 +20439,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "křoví"
@@ -20106,5 +20451,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "vřesoviště"
@@ -20118,7 +20463,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
-msgstr ""
+msgstr "Prales"
 
 #. color water
@@ -20130,5 +20475,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "bahno"
@@ -20142,5 +20487,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "pláž"
@@ -20218,8 +20563,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr ""
@@ -20267,7 +20612,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "hranice"
@@ -20409,10 +20754,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "místo"
@@ -20453,6 +20798,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "adresa"
@@ -20734,174 +21086,36 @@
 msgstr "Ulice NRW Geofabrik.de"
 
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Zvolte něco ze seznamu konfliktů"
-
-#~ msgid "Please select a color."
-#~ msgstr "Zvolte barvu."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Nespouštět v celoobrazovkovém režimu"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Novinky v JOSM"
-
-#~ msgid "OSM History Information"
-#~ msgstr "Historické informace OSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Klikni pro vytvoření nové cesty do existujícího uzlu"
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Vytvoř spojení do existujícího uzlu"
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Klikni k vložení uzlu a vytvoření nové cesty."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Vlož nový uzel a vytvoř nové spojení"
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr "Zvolte objekty, u kterých chcete změnit vlastnosti"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Nahrát na server tuto trasu..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Tato funkce byla přidána nedávno. Prosíme,<br>používejte opatrně a "
-#~ "ujistěte se, že se chová tak, jak očekáváte.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Nahrát trasu filtrovanou JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Nahrát soubor surových dat: "
-
-#~ msgid "Description:"
-#~ msgstr "Popis:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Značky (klíčová slova v GPX souboru)"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "Nahrání GPX"
-
-#~ msgid "time"
-#~ msgstr "čas"
-
-#~ msgid "desc"
-#~ msgstr "popis"
-
-#~ msgid "symbol"
-#~ msgstr "symbol"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Nahrát soubor {0} se surovými daty"
-
-#~ msgid "Tags:"
-#~ msgstr "Značky:"
-
-#~ msgid "Unknown type"
-#~ msgstr "Neznámý typ"
-
-#~ msgid "NullPointerException, Possibly some missing tags."
-#~ msgstr "NullPointerException, pravděpodobně chybí některé tagy."
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Nahrávání {0} {1} (id: {2}) {3}% {4}/{5} ({6} zbývá)..."
-
-#~ msgid "Waterway"
-#~ msgstr "Vodní cesta"
-
-#~ msgid "Provider"
-#~ msgstr "Poskytovatel"
-
-#~ msgid "National_park"
-#~ msgstr "Národní park"
-
-#~ msgid "Add Site"
-#~ msgstr "Přidat stránku"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Smazat stránku(stránky)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Vyberte stránku pro smazání."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Kontrolovat stránku(stránky)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Vyberte stránku(stránky) pro kontrolu na aktualizace."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Přidat novou stránku s pluginy."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Smazat zvolenou stránku(stránky) ze seznamu."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr ""
-#~ "Kontrolovat zvolenou stránku(stránky) pro nové pluginy a aktualizace."
-
-#~ msgid "Version"
-#~ msgstr "Verze"
-
-#~ msgid "Install"
-#~ msgstr "Nainstalovat"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Verze: {0}<br>Poslední změna v {1}"
-
-#~ msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-#~ msgstr "Plugin SurveyorPlugin vyžaduje plugin LiveGpsPlugin !"
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr "LiveGpsPlugin nenalezen, nainstalujte jej a zapněte."
-
-#~ msgid "SurveyorPlugin is disabled for the moment"
-#~ msgstr "SurveyorPlugin je momentálně vypnutý"
-
-#~ msgid "SurveyorPlugin"
-#~ msgstr "SurveyorPlugin"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Verze {0} - poslední změna v {1}"
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "Chyba dat: zeměpisná šířka \"{0}\" je mimo rozsah."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "Chyba dat: zeměpisná délka \"{0}\" je mimo rozsah."
-
-#~ msgid "Add Node"
-#~ msgstr "Přidat uzel"
-
-#~ msgid "Signpost"
-#~ msgstr "Ukazatel"
-
-#~ msgid "NoName"
-#~ msgstr "BezJména"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Neplatné datum"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Stahuji \"Zprávu dne\""
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "Cesta \"{0}\" musí obsahovat alespoň dva uzly."
-
-#~ msgid "Upload GPX track"
-#~ msgstr "Nahrát GPX trasu na server"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "Kolik domů je v řadě?"
-
-#~ msgid "Update available"
-#~ msgstr "Je dostupná aktualizace"
-
-#~ msgid "Version Details:"
-#~ msgstr "Detaily Verze:"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Otevřít..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Popis"
+
+#~ msgid "Commit comment"
+#~ msgstr "Poslat komentář"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Server nepodporuje sady změn"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Opravdu označit tento problém jako \"hotový\"?"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Padací most"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Upravit padací most"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Upravit zkratky"
+
+#~ msgid "sports"
+#~ msgstr "Sportovní potřeby"
+
+#~ msgid "viaduct"
+#~ msgstr "viadukt"
Index: /applications/editors/josm/i18n/po/da.po
===================================================================
--- /applications/editors/josm/i18n/po/da.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/da.po	(revision 14844)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-27 16:02+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-30 02:36+0000\n"
 "Last-Translator: Peter Brodersen <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Skaber hovedgrænsefladen"
@@ -35,39 +35,40 @@
 msgid "The projection could not be read from preferences. Using EPSG:4326"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+"Projektionen kunne ikke læses fra indstillinger. Bruger EPSG:4326 (WGS84)"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Tip: Nogle ændringer kom ved afsendingen af nyt data til serveren"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Ugemte ændringer"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Der er ugemte ændringer. Smid ændringerne væk og fortsæt?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Gem og afslut"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Smid væk og afslut"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -78,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -92,4 +93,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -99,10 +101,10 @@
 msgstr "Fortryd"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorerer defekt URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -128,8 +130,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -270,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -406,6 +408,6 @@
 msgstr "Vend om og sammensæt"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -413,20 +415,20 @@
 msgstr "Indtast værdier for alle konflikter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Løs konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sammensæt {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Alle vejene var tomme"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -528,5 +530,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -647,6 +649,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -655,6 +657,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -709,5 +711,5 @@
 #, java-format
 msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
+msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
@@ -717,4 +719,6 @@
 "\">your language</A>."
 msgstr ""
+"Hjælpesiden mangler. Opret den på <a href=\"{0}\"engelsk</a>. eller i <a "
+"href=\"{1}\">dit eget sprog</a>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:25
@@ -781,5 +785,5 @@
 msgstr "Sammenflet alligevel"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -787,5 +791,5 @@
 "er i brug."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1057,5 +1061,5 @@
 msgstr "Gem nuværende data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1063,26 +1067,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Intet dokument er åbent, så der er intet at gemme."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Dette dokument indeholder intet data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Gem alligevel"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1090,32 +1094,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Afvis konflikter og gem"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Gem GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Gem OSM-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Kunne ikke lave backup af fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Ukendt filtype."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "En fejl opstod under skrivning."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "En fejl opstod ved gendannelse af backup-fil."
@@ -1140,4 +1144,6 @@
 "objects too."
 msgstr ""
+"Vælg alle uslettede objekter i datalaget. Dette vælger også ukomplette "
+"objekter."
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
@@ -1169,18 +1175,18 @@
 msgstr "Luk"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Opdel vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Opdel en vej ved det valgte punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Det nuværende valgte kan ikke bruges til opdeling"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1188,5 +1194,5 @@
 msgstr[1] "De valgte punkter er ikke i midten af nogen vej."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1200,9 +1206,9 @@
 "Der er mere end én vej, som bruger de punkter, du har valgt. Vælg også vejen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "De valgte punkter deler ikke samme vej."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1210,10 +1216,10 @@
 msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Du skal vælge mindst to punkter for at opdele en kredsformig vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1223,5 +1229,5 @@
 "vejen.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1229,5 +1235,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1318,5 +1324,5 @@
 #, java-format
 msgid "Dupe into {0} nodes"
-msgstr ""
+msgstr "Kopier ind i {0} punkter"
 
 #. only one changeCommand for a way, else garbage will happen
@@ -1324,5 +1330,5 @@
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
-msgstr ""
+msgstr "Kopier {0} punkter ind i {1} punkter"
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
@@ -1352,5 +1358,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
 msgid "Unselect All (Escape)"
-msgstr ""
+msgstr "Fravælg alt (Escape)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
@@ -1369,4 +1375,5 @@
 "No data to update found. Have you already opened or downloaded a data layer?"
 msgstr ""
+"Intet data til opdatering. Har du allerede åbnet eller downloadet et datalag?"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
@@ -1379,46 +1386,50 @@
 "fortsætte?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Send til OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Send alle ændringer til OSM-serveren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Tilføjede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Ændrede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Slettede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Angiv en kort kommentar for de ændringer, du uploader:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Send disse ændringer?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Send ændringer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Intet at sende. Skab først noget data."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Der er uløste konflikter. Du skal løse disse først."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Ingen ændringer at sende."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Sender data"
@@ -1441,5 +1452,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
 msgid "Jump back."
-msgstr ""
+msgstr "Hop tilbage."
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
@@ -1461,5 +1472,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
 msgid "Faster Forward"
-msgstr ""
+msgstr "Hurtigere fremad"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
@@ -1470,5 +1481,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
 msgid "Jump forward"
-msgstr ""
+msgstr "Hop fremad"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
@@ -1506,5 +1517,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
 msgid "Slower Forward"
-msgstr ""
+msgstr "Langsommere fremad"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
@@ -1591,5 +1602,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
-msgstr ""
+msgstr "Tilstand: Tegn fokus"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206
@@ -1603,31 +1614,33 @@
 msgstr "Kan ikke tilføje et punkt uden for verdenen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Tilføj punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Tilføj punkt inde i vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Forbind eksisterende vej til punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Tilføj et nyt punkt til en eksisterende vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Tilføj punkt ind i vej og forbind"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Opret nyt punkt."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Vælg punkt under markøren."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1636,9 +1649,4 @@
 msgstr[0] "Indsæt nyt punkt i vej."
 msgstr[1] "Indsæt nyt punkt i {0} veje."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Vælg punkt under markøren."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -1802,5 +1810,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
 msgid "<u>Special targets:</u>"
-msgstr ""
+msgstr "<u>Specielle mål:</u>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
@@ -2054,5 +2062,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2149,4 +2157,5 @@
 msgid "Preferences file had errors. Making backup of old one to {0}."
 msgstr ""
+"Indstillings-filen rummede fejl. Opretter en backup af den gamle fil til {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
@@ -2245,5 +2254,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "jernbane"
@@ -2265,127 +2274,127 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "En vej af typen Område er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipolygon-vej \"{0}\" er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Tomt medlem i relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Slettede medlem \"{0}\" i relation"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vej \"{0}\" med mindre end to punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukendt rolle \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukendt medlemstype for \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Ikke-vej \"{0}\" i multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ingen ydre vej for multipolygon \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "utagget"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "tekst"
@@ -2393,5 +2402,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2419,5 +2428,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "baggrund"
@@ -2425,5 +2434,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
 msgid "highlight"
-msgstr ""
+msgstr "fremhæv"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
@@ -2479,5 +2488,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2491,5 +2500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2519,14 +2528,14 @@
 msgstr "udredet udgave:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Dagens besked er ikke tilgængelig"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+msgstr "- nuværende version er {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Henter \"Dagens besked\""
@@ -2599,71 +2608,72 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Brugernavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Kodeord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+"Kan ikke finde nogen oversættelse for sprogvalget {0}. Benytter i stedet {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "brug"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "valgmuligheder"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Vis denne hjælp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Hent det omsluttende område"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgstr "Hent lokaliteten fra URL'en (med lat=x&lon=y&zoom=z)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Åbn fil (som rå GPS, hvis .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Hent det omsluttende område som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+msgstr "Start op i maksimeret tilstand"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Nulstil indstillingerne til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Vælg sprog."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2671,23 +2681,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "I stedet for --download=<bbox> kan du angive osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Aktiverer opdaterede udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Henter indledende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Sætter standardværdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Henter udvidelser"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2866,5 +2881,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3076,5 +3091,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Rolle"
@@ -3122,73 +3137,71 @@
 msgstr "Egenskaber / Medlemskaber"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Anvend ændringer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Opret ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Ret ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Ret relation #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Grundlæggende"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Optaget af"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (tom værdi fjerner tag)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Flyt op"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Flyt det nuværende valgte medlem op"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Tilføj valgte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Tilføj alle valgte objekter som medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Fjern valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Fjern alle valgte objekter fra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Flyt ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Flyt det nuværende valgte medlem ned"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3197,36 +3210,36 @@
 msgstr "Fjern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Fjern medlemmet i den nuværende tabelrække fra denne relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Hent medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hent alle ufuldstændige veje og punkter der er forbundet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Medlemmer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relations-editor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Der var konflikter ved import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Fejl i fortolkning af server-svar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Kan ikke forbinde til serveren."
@@ -3240,10 +3253,11 @@
 msgstr "Slet de nvalgte relation"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relationer"
@@ -3436,5 +3450,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Steder"
@@ -3481,21 +3495,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "type"
@@ -3548,10 +3562,7 @@
 msgstr "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Kort"
@@ -3705,4 +3716,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3808,5 +3820,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3866,19 +3878,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "uden for det hentede område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består af:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} slettet.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "brug"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3886,21 +3913,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -3982,9 +4009,9 @@
 "You need to have paused audio at the point on the track where you want the "
 "marker."
-msgstr ""
+msgstr "Du skal pause lyden på det punkt på sporet, hvor du vil have markøren."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
 msgid "No existing audio markers in this layer to offset from."
-msgstr ""
+msgstr "Ingen eksisterende lydmarkører i dette lag at forskyde ud fra."
 
 #. Not close enough to track, or no audio marker found for some other reason
@@ -4071,13 +4098,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:30
 msgid "Label audio (and image and web) markers."
-msgstr ""
+msgstr "Marker lyd- (og billede- og web-)markører."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:31
 msgid "Display live audio trace."
-msgstr ""
+msgstr "Vis live lydspor."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:32
 msgid "Create non-audio markers when reading GPX."
-msgstr ""
+msgstr "Opret ikke-lydmarkører, når GPX-data læses."
 
 #. various methods of making markers on import audio
@@ -4126,10 +4153,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:92
 msgid "When importing audio, make markers from..."
-msgstr ""
+msgstr "Når lyd importeres, opret markører ud fra..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:102
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:113
 msgid "When importing audio, apply it to any waypoints in the GPX layer."
-msgstr ""
+msgstr "Når lyd importeres, tilknyt den til ethvert vejpunkt i GPX-laget."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:124
@@ -4324,5 +4351,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4407,4 +4434,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4488,7 +4517,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4501,7 +4527,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4517,10 +4550,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4689,5 +4722,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4721,7 +4756,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4805,4 +4840,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4855,4 +4898,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4861,7 +4910,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4870,15 +4916,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4903,129 +4938,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Navn"
@@ -5074,12 +5111,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Hent alle tern"
+msgstr "Lokale filer"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "intet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5097,54 +5132,44 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
 msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
+msgstr "Opløsning af position (rød = høj, grøn = lav, hvis tilgængelig)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
 msgid "Single Color (can be customized for named layers)"
-msgstr ""
+msgstr "Enkelt farve (kan justeres for navngivne lag)"
 
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Bil"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Cykel"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5152,25 +5177,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Gående"
@@ -5207,5 +5237,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
 msgid "Draw virtual nodes in select mode"
-msgstr ""
+msgstr "Tegn virtuelle punkter i valg-tilstand"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
@@ -5218,7 +5248,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Tegn linjer mellem rå GPS-punkter."
+msgstr "Tegn linjer mellem rå GPS-punkter"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5269,4 +5298,5 @@
 "Layer Manager."
 msgstr ""
+"Alle punkter og spor-segmenter får samme farve. Kan justeres i Layer Manager."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:160
@@ -5279,4 +5309,6 @@
 "capture device needs to logs that information."
 msgstr ""
+"Farver punkter og spor-segmenter ud fra opløsning af position (HDOP). Din "
+"sporingsenhed skal logge denne information."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:166
@@ -5286,5 +5318,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:171
 msgid "Track and Point Coloring"
-msgstr ""
+msgstr "Farvelægning af spor og punkter"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180
@@ -5315,4 +5347,5 @@
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
+"Tegn virtuelle punkter i valg-tilstand for lette tilpasninger af veje.."
 
 #. background layers in inactive color
@@ -5550,5 +5583,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
 msgid "Enable built-in defaults"
-msgstr "Bug indbyggede standarter"
+msgstr "Brug indbyggede standarder"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
@@ -5725,5 +5758,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:277
 msgid "Menu Shortcuts"
-msgstr "Menu-gejvene"
+msgstr "Menu-genveje"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:300
@@ -5834,10 +5867,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, måske på grund af manglende tags."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Forbereder data..."
@@ -5847,25 +5880,75 @@
 msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Åbner rettesæt..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Lukker rettesæt..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Ingen ændringer at sende."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Forbereder..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Uploader..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Fejl i fortolkning af server-svar."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Ukendt vært"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Forkert brugernavn eller kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advarsel: Kodeordet sendes ukrypteret."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Gem brugernavn og kodeord (ukrypteret)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Indtast kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5876,35 +5959,43 @@
 msgstr "Fejl ved fortolkning"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Ukendt version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Ukendt version"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Fandt <nd>-element i en ikke-vej"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> har nul ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Fandt <member>-element i en ikke-relation."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ufuldstændig <member>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Ugyldigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Mangler obligatorisk attribut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
@@ -5912,9 +6003,9 @@
 "Ignorerer en vej fordi den inkluderer et punkt, som ikke eksisterer: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Forbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Defekt id for punkt"
@@ -5924,5 +6015,5 @@
 msgstr "Forbinder til server..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -5930,5 +6021,5 @@
 "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5938,55 +6029,8 @@
 "igen om kort tid."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Angiv en kort kommentar for de ændringer, du uploader:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Indsend kommentar"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} tilbage. Uploader {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "En fejl opstod: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Åbner rettesæt..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Serveren undersøtter ikke rettesæt"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Ukendt vært"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Forbereder..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Uploader..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Lukker rettesæt..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6080,5 +6124,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
 msgid "Keep plugin"
-msgstr ""
+msgstr "Behold udvidelse"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -6156,6 +6200,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "ukendt"
@@ -6342,7 +6386,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Opret områder"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6361,7 +6404,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Opret områder"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6385,5 +6427,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Beskrivelse"
@@ -6883,5 +6925,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
 msgid "Enable automatic caching."
-msgstr ""
+msgstr "Tilvælg automatisk caching."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
@@ -6917,4 +6959,6 @@
 "preferences."
 msgstr ""
+"Erstat den oprindelige hvide baggrund med den baggrundsfarve, der er "
+"defineret i JOSM-indstillingerne."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
@@ -6957,4 +7001,5 @@
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
+"Ældste filer bliver automatisk slettet, når denne størrelse overskrides."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
@@ -7246,5 +7291,5 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46
 msgid "edit gpx tracks"
-msgstr ""
+msgstr "Ret gpx-spor"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85
@@ -7631,7 +7676,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "vand"
@@ -7925,5 +7970,5 @@
 msgstr "OpenStreetBugs download-løkke"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -7940,4 +7985,11 @@
 msgstr "Advarsel"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "En fejl opstod: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7965,35 +8017,38 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Tilføj en kommentar"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Indtast din kommentar"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Markér som udført"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Vil du virkelig lukke?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Ny fejlrapport"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Opret fejlrapport"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Beskriv problemet præcist"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Opret fejlrapport"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8022,5 +8077,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8030,9 +8085,9 @@
 "under indstillingerne."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "osmarender-indstillinger"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Firefox-programfil"
@@ -8072,7 +8127,4 @@
 "talking to the plugin."
 msgstr ""
-"Fjernbetjenings-udvidelsen vil altid lytte på port 8111 på localhost. Porten "
-"kan ikke skiftes idet den benyttes af eksterne applikationer, der snakker "
-"med udvidelsen."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
@@ -8103,95 +8155,76 @@
 msgstr ""
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr ""
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Intet"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-#, fuzzy
-msgid "Click to add route nodes."
-msgstr "Klik for at indsætte et nyt punkt."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-#, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Klik for at indsætte et nyt punkt."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Fjern valgt"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
+msgid "Click to add destination."
+msgstr "destination"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "Åbn en liste over alle relationer"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Station"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+msgid "Add routing layer"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "tertiær"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Genvej"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Hurtigere"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Vend veje om"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Færgerute"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Indstillinger for genveje"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Indstil udvidelses-sites"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Afkørsel"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Maks. hastighed (km/t)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Højde"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8199,33 +8232,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Hent tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Vis status for tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Anmod om opdatering"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Hent alle tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "billedet er ikke indlæst"
@@ -8248,34 +8281,34 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Kilder til tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Autozoom: "
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
 msgstr "Maks. zoomniveau: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "fejl ved indlæsning af metaoplysninger"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "anmodet: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "fejl ved anmodning af opdatering"
@@ -8290,5 +8323,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8343,7 +8376,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Ret stat"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8358,31 +8390,28 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "intet"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "Højde"
+msgstr "Fremhæv"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "multi"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Ret egenskaber for op til {0} objekt"
-msgstr[1] "Ret egenskaber for op til {0} objekter"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Ret egenskaber for op til {0} objekt"
-msgstr[1] "Ret egenskaber for op til {0} objekter"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -8391,25 +8420,21 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Strøm"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Søg"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Filer"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Bil"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8493,5 +8518,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Vejnavn"
@@ -8556,5 +8581,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
 msgid "Only up to two areas can be joined at the moment."
-msgstr ""
+msgstr "Kun op til to områder kan sammensættes i øjeblikket"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
@@ -8593,17 +8618,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relation"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Foren overlappende områder"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Foren overlappende områder"
+msgstr "Sammensatte overlappende områder"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8614,12 +8636,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Sammenfletnings-konflikter."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Slet fra relation"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8628,17 +8648,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Uafsluttede veje."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Fjern foto fra lag"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Motorvejskryds"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9059,18 +9076,18 @@
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr ""
+msgstr "Nøglen \"{0}\" er ikke kendt i forudindstillingerne"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Presets do not contain property key"
-msgstr ""
+msgstr "Forudindstillingerne rummer ikke egenskabs-nøglen"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr ""
+msgstr "Værdien \"{0}\" for nøglen \"{1}\" findes ikke i forudindstillingerne"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
 msgid "Presets do not contain property value"
-msgstr ""
+msgstr "Værdien er ikke kendt i forudindstillingerne"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
@@ -9233,4 +9250,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9312,7 +9335,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "bygning"
@@ -9326,5 +9349,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "område"
@@ -9456,4 +9479,27 @@
 "use."
 msgstr ""
+"Du kan tilføje, rette og slette WMS-enheder i WMSudvidelses-"
+"indstillingsfanebladet - de vil derefter blive vist i WMS-menuen.\n"
+"\n"
+"Du kan også rette dette manuelt i avancerede indstillinger ved at bruge "
+"følgende notation:\n"
+"wmsplugin.url.1.name=Landsat\n"
+"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+"wmsplugin.url.2.name=NPE Maps... etc\n"
+"\n"
+"Eksempel på fuld WMS URL-inputformat (landsat)\n"
+"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+"format=image/jpeg \n"
+"\n"
+"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/  skal du "
+"kun bruge det relevante 'id' som input..\n"
+"Vil du tilføje et Metacarta Map Rectifier-menupunkt manuelt, opret da en URL "
+"manuelt som i dette eksempel, hvor du erstatter 63 med dit billede-id: \n"
+"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
+"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
+" \n"
+"Bemærk: Vær sikker på at billedet er hensigtsmæssigt at bruge ud fra "
+"ophavsretsmæssige betragtninger. Er du i tvivl, så undlad at bruge billedet."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
@@ -9463,9 +9509,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
 msgid "Rectified Image..."
-msgstr ""
+msgstr "Korrigeret billede..."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:20
 msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-msgstr ""
+msgstr "Hent korrigeret billede fra Metacartas Map Recitifier WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24
@@ -9480,5 +9526,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
 msgid "Adjust the position of the selected WMS layer"
-msgstr ""
+msgstr "Tilpas positionen for det valgte WMS-lag"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
@@ -9491,5 +9537,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
-msgstr ""
+msgstr "Automatisk download"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
@@ -9507,4 +9553,6 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
+"Det anmodede område er for stort. Zoom venligst en smule ind eller ret "
+"opløsningen."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232
@@ -9514,9 +9562,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Change resolution"
-msgstr ""
+msgstr "Skift opløsning"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253
 msgid "Reload erroneous tiles"
-msgstr ""
+msgstr "Genhent fejlagtige tern"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271
@@ -9534,9 +9582,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
 msgid "WMS Plugin Preferences"
-msgstr ""
+msgstr "Indstillinger for WMS-udvidelse"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
+msgstr "Ret listen over WMS-servere, som vises i WMS-udvidelsesmenuen"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
@@ -9564,5 +9612,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Copy Default"
-msgstr ""
+msgstr "Kopier standardværdi"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:101
@@ -9597,4 +9645,9 @@
 #: build/specialmessages.java:9
 msgid "could not get audio input stream from input URL"
+msgstr "kunne ikke hente lydkilde fra URL'en"
+
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
 msgstr ""
 
@@ -9623,7 +9676,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Opret områder"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9713,22 +9765,30 @@
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
+"Starter Firefox for at vise det synlige område som et pænt SVG-billede."
+
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9737,15 +9797,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9755,15 +9815,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr "Laver rækkehuse ud af en enkelt blok."
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9772,5 +9832,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9781,5 +9841,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9790,5 +9850,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9878,5 +9938,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Reference"
@@ -9931,7 +9991,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Lag"
@@ -9974,5 +10034,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Maks. hastighed (km/t)"
@@ -10020,5 +10080,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Ensrettet"
@@ -10074,5 +10134,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -10122,5 +10182,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -10167,5 +10227,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr ""
@@ -10212,5 +10272,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Vold"
@@ -10368,6 +10428,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr ""
@@ -10416,5 +10476,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Overflade"
@@ -10446,5 +10506,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "asfalteret"
@@ -10455,5 +10515,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "uasfalteret"
@@ -10467,5 +10527,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "toppede brosten"
@@ -10617,5 +10677,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10636,6 +10696,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "ja"
@@ -10779,7 +10839,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "nej"
@@ -10793,73 +10853,63 @@
 msgstr "Lastbil"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Hest"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motorcykel"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Motorkøretøj"
@@ -10934,130 +10984,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Type"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11065,5 +11003,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11071,11 +11009,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11083,5 +11015,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11089,5 +11021,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11095,5 +11027,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11101,6 +11033,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11119,6 +11057,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "motorvej"
@@ -11144,6 +11082,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "forbindelse"
@@ -11169,6 +11107,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "primær"
@@ -11194,6 +11132,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "sekundær"
@@ -11207,5 +11145,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "tertiær"
@@ -11223,5 +11161,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "beboelse"
@@ -11239,5 +11177,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr ""
@@ -11264,6 +11202,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr ""
@@ -11304,6 +11242,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11314,5 +11251,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "rundkørsel"
@@ -11362,5 +11299,5 @@
 #: build/trans_presets.java:459
 msgid "Pedestrian"
-msgstr ""
+msgstr "Gågade"
 
 #. item
@@ -11369,5 +11306,5 @@
 #: build/trans_presets.java:462
 msgid "Edit Pedestrian Street"
-msgstr ""
+msgstr "Ret gågade"
 
 #. item "Ways/Pedestrian" text "Width (meters)"
@@ -11656,14 +11593,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Selskab"
@@ -11682,5 +11619,5 @@
 #: build/trans_presets.java:754
 msgid "Pedestrian crossing type"
-msgstr ""
+msgstr "Type af fodgængerfelt"
 
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
@@ -11688,20 +11625,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "helleanlæg"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11709,5 +11646,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11716,5 +11653,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11724,5 +11661,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11737,9 +11674,9 @@
 #: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "zebra"
-msgstr ""
+msgstr "fodgængerfelt"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "pelican"
-msgstr ""
+msgstr "fodgængerfelt med trafikstyring"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
@@ -11768,5 +11705,5 @@
 #: build/trans_presets.java:764
 msgid "Pedestrian Crossing"
-msgstr ""
+msgstr "Fodgængerfelt"
 
 #. item
@@ -11784,5 +11721,5 @@
 #: build/trans_presets.java:775
 msgid "Mini-roundabout"
-msgstr ""
+msgstr "Mini-rundkørsel"
 
 #. item
@@ -11802,5 +11739,5 @@
 #: build/trans_presets.java:782
 msgid "Turning Circle"
-msgstr ""
+msgstr "Vendeplads"
 
 #. item
@@ -11871,10 +11808,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Højde"
@@ -11887,29 +11825,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Stente"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Ret en stente"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Pæl"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Ret en pæl"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11918,7 +11845,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11927,69 +11857,54 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Tilladt trafik:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Pæl"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Kreaturrist"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Ret en kreaturrist"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
 #: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Ret en pæl"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Vindebro"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Ret en vindebro"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -11997,36 +11912,87 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Kreaturrist"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Ret en kreaturrist"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:864
 msgid "Spikes"
 msgstr "Pigge"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:865
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Faldgitter"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Ret et faldgitter"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Betalingsanlæg"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Ret betalingsanlæg"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Grænsekontrol"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Ret grænsekontrol"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Hæk"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Hegn"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Mur"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Bymur"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Støttemur"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Indgang"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Ret indgang"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "Port"
@@ -12034,128 +12000,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr "Ret en port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Stente"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Ret en stente"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Udfaldsport"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Ret en udfaldsport"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Hæk"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Hegn"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Mur"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Bymur"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Støttemur"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Betalingsanlæg"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Ret betalingsanlæg"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Grænsekontrol"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Ret grænsekontrol"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Indgang"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Ret indgang"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Vand"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Udspring"
@@ -12163,5 +12081,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Ret udspring"
@@ -12169,5 +12087,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Dræn"
@@ -12175,10 +12093,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Ret dræn"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Strøm"
@@ -12186,10 +12104,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Ret strøm"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Kanal"
@@ -12197,10 +12115,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Ret kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Flod"
@@ -12210,5 +12128,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Ret flod"
@@ -12216,15 +12134,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Ret vand"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Ret land"
@@ -12232,15 +12150,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Vandreservoir"
@@ -12248,21 +12166,21 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Ret område for vandreservoir"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1101
+msgstr "Overdækket reservoir"
+
+#. item
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
-msgstr ""
+msgstr "Ret overdækket reservoir"
 
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Flodbred"
@@ -12271,10 +12189,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Ret flodbred"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Vådområde"
@@ -12285,56 +12203,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Ret vådområde"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "Sump"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "mose"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "saltmarsk"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Mudder"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Strand"
@@ -12342,20 +12260,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Ret strand"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Bugt"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Ret bugt"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Klippe"
@@ -12363,10 +12281,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Ret klippe"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -12374,5 +12292,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Ret kystlinje"
@@ -12380,5 +12298,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Færgerute"
@@ -12386,5 +12304,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Ret færge"
@@ -12393,5 +12311,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr ""
@@ -12399,10 +12317,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Dok"
@@ -12410,5 +12328,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Ret dok"
@@ -12416,5 +12334,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Dæmning"
@@ -12422,15 +12340,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Ret dæmning"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Vandvejs-punkt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr ""
@@ -12439,5 +12357,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr ""
@@ -12445,20 +12363,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Vandfald"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Ret vandfald"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr ""
@@ -12467,15 +12385,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Lystbådehavn"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Ret lystbådehavn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Mole"
@@ -12483,10 +12401,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Ret mole"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Færgehavn"
@@ -12494,10 +12412,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Ret færgehavn"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Slæbested"
@@ -12507,5 +12425,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Ret slæbested"
@@ -12513,10 +12431,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Spor"
@@ -12524,5 +12442,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Ret spor"
@@ -12552,8 +12470,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Valgfri typer"
@@ -12567,35 +12485,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "sidespor"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Monorail"
@@ -12603,45 +12521,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Ret monorail"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Bevaret"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Ret bevaret jernbane"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Letbane"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Ret letbane"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Ret metro"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Sporvogn"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Ret sporvogn"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Styreskinne til bus"
@@ -12649,5 +12567,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Ret styreskinne til bus"
@@ -12656,14 +12574,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Ubrugt jernbanespor"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Ret ubrugt jernbanespor"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Fjernet jernbane"
@@ -12672,5 +12590,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Jernbaneoverskæring"
@@ -12679,5 +12597,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Fodgængerovergang"
@@ -12687,5 +12605,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12693,5 +12611,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Drejeskive"
@@ -12700,10 +12618,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Luftvej"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Skilift"
@@ -12711,10 +12629,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Ret skilift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Træklift"
@@ -12722,10 +12640,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Ret træklift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Tovbane"
@@ -12733,24 +12651,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Ret tovbane"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Ret Golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Station"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Ret station"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Benzin"
@@ -12760,5 +12691,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Ret benzin"
@@ -12774,5 +12705,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12782,5 +12713,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Ret parkering"
@@ -12788,40 +12719,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Kapacitet"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "overflade"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "fleretages"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Handicapplads"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Gebyr"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Vask"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Ret bilvask"
@@ -12829,5 +12761,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr ""
@@ -12835,15 +12767,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Bilmekaniker"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Ret bilmekaniker"
@@ -12851,5 +12783,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Udlejning"
@@ -12858,10 +12790,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Ret biludlejning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Deling"
@@ -12869,5 +12801,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr ""
@@ -12875,5 +12807,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -12882,5 +12814,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Ret cykeludlejning"
@@ -12889,15 +12821,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Ret cykelhandler"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Offentlig transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr ""
@@ -12905,5 +12837,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr ""
@@ -12911,5 +12843,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr ""
@@ -12917,5 +12849,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr ""
@@ -12924,5 +12856,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr ""
@@ -12930,5 +12862,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr ""
@@ -12937,5 +12869,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr ""
@@ -12947,5 +12879,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr ""
@@ -12953,10 +12885,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Indgang til undergrundsbane"
@@ -12965,10 +12897,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Ret indgang til undergrundsbane"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr ""
@@ -12977,5 +12909,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr ""
@@ -12984,5 +12916,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr ""
@@ -12990,5 +12922,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Busstop"
@@ -12998,5 +12930,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Ret busstop"
@@ -13004,10 +12936,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr ""
@@ -13015,5 +12947,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13021,5 +12953,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Ret taxiholdeplads"
@@ -13027,5 +12959,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Lufthavn"
@@ -13033,15 +12965,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13050,5 +12982,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Overnatning"
@@ -13060,5 +12992,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -13067,15 +12999,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Ret hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motel"
@@ -13083,31 +13015,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Ret motel"
 
 #. item "Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1543
+msgid "Guest House"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1544
+msgid "Edit Guest House"
+msgstr ""
+
+#. item "Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1548
+msgid "Chalet"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #: build/trans_presets.java:1550
-msgid "Guest House"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1551
-msgid "Edit Guest House"
-msgstr ""
-
-#. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
-msgid "Chalet"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Vandrerhjem"
@@ -13115,41 +13047,41 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Ret vandrerhjem"
 
 #. item "Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1560
+msgid "Alpine Hut"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1561
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1566
+msgid "Caravan Site"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1567
-msgid "Alpine Hut"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1568
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Accomodation/Alpine Hut" text "Elevation"
+msgid "Edit Caravan Site"
+msgstr ""
+
+#. item "Accomodation/Caravan Site" text "Name"
+#: build/trans_presets.java:1571
+msgid "Camping Site"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #: build/trans_presets.java:1573
-msgid "Caravan Site"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1574
-msgid "Edit Caravan Site"
-msgstr ""
-
-#. item "Accomodation/Caravan Site" text "Name"
+msgid "Edit Camping Site"
+msgstr ""
+
+#. item "Accomodation/Camping Site" text "Name"
 #: build/trans_presets.java:1578
-msgid "Camping Site"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
-msgid "Edit Camping Site"
-msgstr ""
-
-#. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
 msgid "Food+Drinks"
 msgstr "Mad+drikke"
@@ -13160,5 +13092,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -13166,5 +13098,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Ret restaurant"
@@ -13172,5 +13104,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Køkken"
@@ -13178,61 +13110,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "græsk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexicansk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Fastfood"
@@ -13240,9 +13172,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Ret fastfood-restaurant"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Café"
@@ -13250,10 +13182,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Ret café"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Pub"
@@ -13261,31 +13193,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Ret pub"
 
 #. item "Food+Drinks/Pub" text "Name"
+#: build/trans_presets.java:1605
+msgid "Biergarten"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1606
+msgid "Edit Biergarten"
+msgstr ""
+
+#. item "Food+Drinks/Biergarten" text "Name"
+#: build/trans_presets.java:1610
+msgid "Bar"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #: build/trans_presets.java:1612
-msgid "Biergarten"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1613
-msgid "Edit Biergarten"
-msgstr ""
-
-#. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
-msgid "Bar"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Natklub"
@@ -13293,20 +13225,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Ret natklub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Forlystelse"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Ret forlystelse"
@@ -13315,22 +13247,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Åbningstider"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "Museum"
@@ -13338,10 +13259,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "Ret museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "Zoo"
@@ -13350,10 +13271,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "Ret zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr ""
@@ -13361,25 +13282,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr "Udkigstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1666
+msgstr "Forlystelsespark"
+
+#. item
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
-msgstr ""
+msgstr "Ret forlystelsespark"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr ""
@@ -13387,5 +13308,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr ""
@@ -13393,77 +13314,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "kort"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "bykort"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "cykelkort"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr "dyreliv"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr ""
@@ -13471,25 +13404,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Borg"
@@ -13498,20 +13431,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Ret borg"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Ret ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
@@ -13520,20 +13453,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Ret arkæologisk sted"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Slagmark"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Ret slagmark"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -13541,56 +13486,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Ret mindesmærke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Slagmark"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Ret slagmark"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Legeplads"
@@ -13598,15 +13532,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
@@ -13614,15 +13548,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -13636,6 +13570,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "vælg sportsgren:"
@@ -13714,4 +13648,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14003,28 +13945,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "sport"
@@ -14034,227 +13977,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "bueskydning"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "australsk fodbold"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "petanque"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "hundeløb"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "travbane"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "skydebane"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "skisport"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "fodbold"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "svømning"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Ret multi"
@@ -14293,191 +14236,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Ret motorsport"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Skating"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Ret svømning"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Skisport"
@@ -14485,56 +14428,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Ret skisport"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
+#: build/trans_presets.java:1924
+msgid "Difficulty"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:1924
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
+msgstr "asfalteret"
+
+#: build/trans_presets.java:1924
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "Difficulty"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
-msgid "novice"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "easy"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "intermedia"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "advance"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "Skydning"
@@ -14542,178 +14486,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Ret skydning"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Amerikansk fodbold"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Ret amerikansk fodbold"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Petanque"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Ret rugby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Ret tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Bygning"
@@ -14721,5 +14665,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -14727,10 +14671,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Ret offentlig bygning"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Rådhus"
@@ -14738,10 +14682,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Ret rådhus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Ambassade"
@@ -14749,10 +14693,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Ret ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Domhus"
@@ -14761,10 +14705,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Ret domhus"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Fængsel"
@@ -14773,10 +14717,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Ret fængsel"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Politi"
@@ -14786,10 +14730,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Ret politi"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -14798,10 +14742,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Ret brandstation"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Posthus"
@@ -14809,5 +14753,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Ret posthus"
@@ -14815,15 +14759,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Skole"
@@ -14831,10 +14775,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Ret skole"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Universitet"
@@ -14842,10 +14786,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Ret universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr ""
@@ -14853,5 +14797,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr ""
@@ -14859,5 +14803,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Biograf"
@@ -14866,10 +14810,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Ret biograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Bibliotek"
@@ -14878,10 +14822,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Ret bibliotek"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr ""
@@ -14889,10 +14833,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Teater"
@@ -14901,10 +14845,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Ret teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -14914,5 +14858,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Ret sted for tilbedelse"
@@ -14921,6 +14865,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Religion"
@@ -14929,66 +14873,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "buddhistisk"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "hinduistisk"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "jainistisk"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "muslimsk"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "spiritistisk"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "taoistisk"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "unitaristisk"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "zoroastristisk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Trosretning"
@@ -14997,81 +14942,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "baptistisk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "Jehovas Vidner"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "metodistisk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "mormonsk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "pinsebevægelsen"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "prebyteriansk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestantisk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "kvæker"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "shiitisk"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "sunnitisk"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Adresser"
@@ -15080,5 +15025,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Ret adresseinformation"
@@ -15086,5 +15031,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Husnummer"
@@ -15092,20 +15037,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Bynavn"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Landekode"
@@ -15113,5 +15058,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -15120,5 +15065,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Ret adresse-interpolering"
@@ -15126,67 +15071,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Nummereringssystem"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "ulige"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "lige"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "alle"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "atletik"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2187
+msgstr "Fabrik"
+
+#. item
+#: build/trans_presets.java:2184
 msgid "Edit Works"
-msgstr ""
+msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Tårn"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -15194,10 +15144,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -15205,10 +15155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -15216,10 +15166,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Ret rørledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -15229,10 +15179,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Kran"
@@ -15240,10 +15190,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Ret kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Pejlemærke"
@@ -15251,10 +15201,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr ""
@@ -15262,10 +15212,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -15273,5 +15223,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Ret overvågningskamera"
@@ -15279,5 +15229,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Generator"
@@ -15287,39 +15237,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -15328,10 +15278,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -15340,5 +15290,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Ret transformatorstation"
@@ -15346,10 +15296,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Elmast"
@@ -15360,5 +15310,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Ret elmast"
@@ -15366,5 +15316,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Strømkabel"
@@ -15373,25 +15323,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Ret strømkabel"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Spænding"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Toiletter"
@@ -15399,25 +15349,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr ""
 
-#. item "Amenities/Toilets" text "Reference number"
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
+msgid "Note"
+msgstr ""
+
+#. item "Amenities/Toilets" text "Note"
 #: build/trans_presets.java:2307
-msgid "Charge"
-msgstr ""
-
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
-msgid "Note"
-msgstr ""
-
-#. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telefon"
@@ -15426,5 +15371,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Ret telefon"
@@ -15432,5 +15377,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Mønter"
@@ -15438,5 +15383,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr ""
@@ -15444,5 +15389,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -15450,5 +15395,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr ""
@@ -15456,15 +15401,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Genbrug"
@@ -15473,5 +15418,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Ret genbrugsplads"
@@ -15479,35 +15424,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Dåser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Tøj"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Skrotjern"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Bænk"
@@ -15516,20 +15461,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Skydetelt"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Skjul"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Lås"
@@ -15537,22 +15482,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Springvand"
@@ -15561,10 +15506,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -15573,10 +15518,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Babyluge"
@@ -15584,25 +15529,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Ret babyluge"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Ret supermarked"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr ""
@@ -15610,10 +15555,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -15621,10 +15566,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Ret kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Automat"
@@ -15632,5 +15577,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Ret automat"
@@ -15638,88 +15583,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Varer i automat"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "P-automat"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "mad"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "billeder"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "dyremad"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "legetøj"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "frimærker"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tamponer"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "høm-høm-pose"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Slagter"
@@ -15727,10 +15672,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Ret slagter"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Bager"
@@ -15738,81 +15683,95 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Ret bager"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
-msgstr ""
+msgstr "Blomsterhandler"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
-msgstr ""
+msgstr "Ret blomsterhandler"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Skole"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Ret cykelhandler"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
-msgstr ""
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
+msgstr "Ret busstop"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2451
+msgstr "Møbelforretning"
+
+#. item
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
-msgstr ""
+msgstr "Ret møbelforretning"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr ""
@@ -15820,10 +15779,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -15831,10 +15790,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Gør-det-selv-butik"
@@ -15842,60 +15801,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 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:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Ret frisør"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2489
+msgstr "Legetøjsbutik"
+
+#. item
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Kemisk renseri"
@@ -15903,10 +15862,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Ret kemisk renseri"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -15914,10 +15873,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Ret vaskeri"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr ""
@@ -15925,35 +15884,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Sport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr ""
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2522
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
+msgstr "optiker"
+
+#. item
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
-msgstr ""
-
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+msgstr "Ret optiker"
+
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Penge"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Bank"
@@ -15961,5 +15922,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Ret bank"
@@ -15967,10 +15928,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Pengeautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Vekselkontor"
@@ -15978,5 +15939,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Ret vekselkontor"
@@ -15984,15 +15945,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Ret pengeautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Sundhed"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Lægehus"
@@ -16000,20 +15961,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Ret lægehus"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Tandlæge"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Ret tandlæge"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -16021,5 +15982,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Ret apotek"
@@ -16027,10 +15988,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Hospital"
@@ -16038,10 +15999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Ret Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr ""
@@ -16050,5 +16011,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -16057,20 +16018,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(brug forvalgskode, fx +12-345-67890)"
@@ -16078,5 +16039,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -16085,25 +16046,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Ret dyrlæge"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Ret et kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Ret land"
@@ -16111,45 +16072,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Stat"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Ret stat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Ret region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Amt"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Ret amt"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "By"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Ret by"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Mindre by"
@@ -16157,10 +16119,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Ret mindre by"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Forstad"
@@ -16168,41 +16130,42 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Ret forstad"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "By"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Ret by"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Landsby"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
-msgstr "Lokalitet"
+msgstr "Egn"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Ret lokalitet"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Ø"
@@ -16210,5 +16173,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Ret ø"
@@ -16216,5 +16179,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Huleindgang"
@@ -16222,10 +16185,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Ret huleindgang"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Tinde"
@@ -16233,10 +16196,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Ret tinde"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -16244,10 +16207,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Ret gletsjer"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Vulkan"
@@ -16255,70 +16218,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Ret vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Grænser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "National"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Ret landegrænser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Administrativt"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Ret administrativ grænse"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Ret civil-grænse"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Ret politisk grænse"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Ret grænser for nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Træ"
@@ -16327,15 +16290,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Ret et træ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Skov"
@@ -16344,5 +16307,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Ret skov"
@@ -16350,17 +16313,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "Nåleskov"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "Løvskov"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Skov"
@@ -16369,19 +16332,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Ret skovområde"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Ret naturreservat"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Ur"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Ret ur"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Krat"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Ret krat"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Højdedrag"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Ret højdedrag"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Hede"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Ret hede"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -16390,70 +16397,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Have"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16461,10 +16469,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr ""
@@ -16472,20 +16480,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -16493,5 +16501,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Ret rekreativt område"
@@ -16499,15 +16507,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Kirkegård"
@@ -16515,9 +16523,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -16525,39 +16533,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Industri"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr ""
@@ -16565,114 +16573,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Militært område"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Ret militært område"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
-msgid "Brownfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2886
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
-msgid "Greenfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2892
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2921
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2922
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2927
+msgid "Brownfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2928
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:2933
+msgid "Greenfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2934
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Militært område"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Ret militært område"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Ur"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Ret ur"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Krat"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Ret krat"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Højdedrag"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Ret højdedrag"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Hede"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Ret hede"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr ""
@@ -16682,5 +16647,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr ""
@@ -16689,10 +16654,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "ydre segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "indre segment"
@@ -16700,5 +16665,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr ""
@@ -16707,5 +16672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -16713,34 +16678,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr ""
@@ -16749,15 +16714,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr ""
@@ -16765,5 +16730,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16772,5 +16737,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16778,5 +16743,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -16848,24 +16813,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "cykel"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -16910,4 +16875,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16917,19 +16885,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "fod"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -16943,10 +16912,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -16954,26 +16923,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr ""
@@ -16982,30 +16951,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17189,4 +17158,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17198,4 +17274,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17297,11 +17382,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr ""
@@ -17343,7 +17430,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "hest"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Barrierer"
 
 #. color tertiary
@@ -17379,6 +17681,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr ""
@@ -17434,7 +17736,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr ""
@@ -17481,108 +17783,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "bane"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viadukt"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17599,4 +17814,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "Service"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17606,4 +17827,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Vadested"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17620,6 +17847,19 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
 msgstr ""
 
@@ -17633,5 +17873,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "flodbred"
@@ -17645,5 +17885,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr ""
@@ -17657,5 +17897,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr ""
@@ -17683,5 +17923,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "akvædukt"
@@ -17696,4 +17936,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17733,5 +17974,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17848,12 +18089,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "menneskeskabt"
@@ -17899,5 +18141,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17915,7 +18157,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17938,10 +18180,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17971,6 +18213,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -18015,6 +18257,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -18028,5 +18270,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr ""
@@ -18048,5 +18290,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -18060,5 +18302,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -18081,4 +18323,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18098,4 +18348,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr ""
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18104,23 +18360,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr ""
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr ""
@@ -18134,5 +18377,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr ""
@@ -18146,5 +18390,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr ""
@@ -18157,6 +18402,20 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+msgid "piste_expert"
+msgstr ""
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18170,5 +18429,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr ""
@@ -18199,4 +18459,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18231,4 +18499,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18241,8 +18533,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr ""
@@ -18255,5 +18549,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr ""
@@ -18267,5 +18564,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "rørledning"
@@ -18393,12 +18690,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "rekreation"
@@ -18412,5 +18709,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr ""
@@ -18482,8 +18779,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18519,4 +18816,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18576,11 +18881,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18719,6 +19024,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18945,22 +19271,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -18992,6 +19318,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -19027,4 +19353,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19044,7 +19378,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "helbred"
@@ -19138,4 +19473,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19338,4 +19681,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19369,28 +19728,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "butik"
@@ -19444,4 +19805,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19454,8 +19823,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotel"
@@ -19510,4 +19879,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19604,9 +19974,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "turisme"
@@ -19678,8 +20048,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "historisk"
@@ -19749,9 +20119,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr ""
@@ -19765,5 +20135,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "stenbrud"
@@ -19777,5 +20147,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr ""
@@ -19797,5 +20167,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr ""
@@ -19809,5 +20179,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "skov"
@@ -19821,5 +20191,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -19842,5 +20212,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr ""
@@ -19854,5 +20224,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "industri"
@@ -19866,5 +20236,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19878,5 +20248,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -19890,5 +20260,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -19945,7 +20315,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "militær"
@@ -19959,5 +20329,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "kirkegård"
@@ -19970,5 +20340,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr ""
@@ -19983,5 +20353,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "gletsjer"
@@ -19995,5 +20365,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "vulkan"
@@ -20008,4 +20378,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20047,7 +20418,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr ""
@@ -20061,5 +20433,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "buskads"
@@ -20073,5 +20445,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "hede"
@@ -20085,5 +20457,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr ""
@@ -20097,5 +20469,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr ""
@@ -20109,5 +20481,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "strand"
@@ -20185,8 +20557,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr ""
@@ -20234,7 +20606,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "grænse"
@@ -20376,10 +20748,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "sted"
@@ -20420,6 +20792,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "adresse"
@@ -20701,190 +21080,36 @@
 msgstr ""
 
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Vælg noget fra listen over konflikter."
-
-#~ msgid "Please select a color."
-#~ msgstr "Vælg venligst en farve."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Start ikke op i fuldskærm"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Nyheder om JOSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Klik for at oprette en ny vej til det eksisterende punkt."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Klik for at lave en forbindelse til det eksisterende punkt."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Klik for at indsætte et punkt og oprette en ny vej."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Klik for at indsætte et nyt punkt og lave en forbindelse."
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr "Vælg de objekter, du vil rette egenskaber for."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "Dette er den grundlæggende relations-editor, som giver dig mulighed for "
-#~ "at rette relationens tags såvel som medlemmernes. Ydermere burde vi have "
-#~ "en indsigtsfuld editor, som bemærker typen af relation og begrænser på en "
-#~ "hensigtsmæssig måde."
-
-#~ msgid "Highlight the member from the current table row as JOSM's selection"
-#~ msgstr "Fremhæv medlemmet fra den nuværende tabelrække som JOSM's valg"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Upload denne trace..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Denne funktionalitet er først nyligt blevet tilføjet. "
-#~ "Brug<br>venligst varsomt og tjek om den virker som forventet.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Upload spor filtreret af JOSM"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Tags (nøgleord i GPX):"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "GPX-Upload"
-
-#~ msgid "time"
-#~ msgstr "tid"
-
-#~ msgid "desc"
-#~ msgstr "beskrivelse"
-
-#~ msgid "symbol"
-#~ msgstr "symbol"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Upload rå fil: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Tags:"
-
-#~ msgid "Unknown type"
-#~ msgstr "Ukendt type"
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} tilbage)..."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Ret en afkørsel"
-
-#~ msgid "Exit Number"
-#~ msgstr "Afkørselsnummer"
-
-#~ msgid "Waterway"
-#~ msgstr "Vandvej"
-
-#~ msgid "political"
-#~ msgstr "Politisk"
-
-#~ msgid "National_park"
-#~ msgstr "Nationalpark"
-
-#~ msgid "Natural"
-#~ msgstr "Geografi"
-
-#~ msgid "Add Site"
-#~ msgstr "Tilføj site"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Fjern site(s)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Vælg venligst det site, der skal slettes."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Tjek site(s)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Vælg venligst de sites, der skal tjekkes for opdateringer."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Tilføj et nyt site for udvidelser."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Fjern de valgte sites fra listen."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr "Tjek de valgte sites for nye udvidelser eller opdateringer."
-
-#~ msgid "Update Sites"
-#~ msgstr "Opdater sites"
-
-#~ msgid "Version"
-#~ msgstr "Version"
-
-#~ msgid "Install"
-#~ msgstr "Installér"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Version: {0}<br>Seneste ændring ved {1}"
-
-#~ msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-#~ msgstr "SurveyorPlugin afhænger af LiveGpsPlugin!"
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr "LiveGpsPlugin blev ikke fundet; installér og aktiver venligst"
-
-#~ msgid "SurveyorPlugin is disabled for the moment"
-#~ msgstr "SurveyorPlugin er slået fra i øjeblikket"
-
-#~ msgid "SurveyorPlugin"
-#~ msgstr "SurveyorPlugin"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Version {0} - Seneste ændring ved {1}"
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "Datafejl: bredde-værdi \"{0}\" er uden for grænserne."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "Datafejl: længde-værdi \"{0}\" er uden for grænserne."
-
-#~ msgid "Add Node"
-#~ msgstr "Tilføj punkt"
-
-#~ msgid "office"
-#~ msgstr "kontor"
-
-#~ msgid "NoName"
-#~ msgstr "Unavngivet"
-
-#~ msgid "Ref"
-#~ msgstr "Ref"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Opdatér URL for site"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Ugyldig URL"
-
-#~ msgid "unusual named way type"
-#~ msgstr "usædvanligt navngivet vejtype"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Hent \"Dagens besked\""
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "Hvor mange bygninger er der i blokken"
-
-#~ msgid "Update available"
-#~ msgstr "En opdatering er tilgængelig"
-
-#~ msgid "Version Details:"
-#~ msgstr "Detaljer for versionen:"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Åbn..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Beskrivelse"
+
+#~ msgid "Commit comment"
+#~ msgstr "Indsend kommentar"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Serveren undersøtter ikke rettesæt"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Vil du virkelig markere denne fejlrapport som \"udført\"?"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Vindebro"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Ret en vindebro"
+
+#~ msgid "Portcullis"
+#~ msgstr "Faldgitter"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Ret et faldgitter"
+
+#~ msgid "viaduct"
+#~ msgstr "viadukt"
Index: /applications/editors/josm/i18n/po/de.po
===================================================================
--- /applications/editors/josm/i18n/po/de.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/de.po	(revision 14844)
@@ -8,6 +8,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-31 17:04+0200\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-30 15:23+0200\n"
 "Last-Translator: Dirk Stöcker <openstreetmap@dstoecker.de>\n"
 "Language-Team:  <de@li.org>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:52+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:48+0000\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Erzeuge Hauptfenster"
@@ -38,38 +38,39 @@
 "EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden."
-
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+msgstr ""
+"Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden."
+
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Ungesicherte Änderungen"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Es gibt ungesicherte Daten. Änderungen verwerfen und fortfahren?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Speichern und Beenden"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Verwerfen und Beenden"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -80,10 +81,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -94,4 +95,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -101,10 +103,10 @@
 msgstr "Abbrechen"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoriere die ungültige URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -130,8 +132,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -272,5 +274,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -408,6 +410,6 @@
 msgstr "Drehen und Verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -415,20 +417,20 @@
 msgstr "Werte für alle Konflikte festlegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Konflikte auflösen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} Wege verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Alle Wege sind leer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -532,5 +534,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -651,6 +653,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -659,6 +661,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -787,5 +789,5 @@
 msgstr "Trotzdem vereinen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -793,5 +795,5 @@
 "gelöscht werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -960,9 +962,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73
 msgid "Please select one or more closed ways of at least four nodes."
-msgstr "Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen."
+msgstr ""
+"Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
 msgid "Please select ways with almost right angles to orthogonalize."
-msgstr "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen."
+msgstr ""
+"Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95
@@ -1066,5 +1070,5 @@
 msgstr "Aktuelle Daten speichern."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1074,26 +1078,26 @@
 "no layer.\""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Leeres Dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Das Dokument enthält keine Daten."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Trotzdem speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Konflikte"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1103,32 +1107,32 @@
 "Sollen alle Konflikte abgewiesen werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Konflikte abweisen und speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "GPX-Datei speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "OSM-Datei speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Sicherung der Datei konnte nicht erstellt werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Dateiendung unbekannt."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Beim Speichern ist ein Fehler aufgetreten."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Beim Wiederherstellen ist ein Fehler aufgetreten."
@@ -1163,5 +1167,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
 msgid "Show status report with useful information that can be attached to bugs"
-msgstr "Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen"
+msgstr ""
+"Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
@@ -1184,18 +1189,18 @@
 msgstr "Schließen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Weg aufspalten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Weg am gewählten Knotenpunkt aufspalten."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Die aktuelle Auswahl kann nicht zum Aufspalten verwendet werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1203,5 +1208,5 @@
 msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1217,9 +1222,9 @@
 "Bitte auch den Weg auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "Die gewählten Punkte gehören nicht zum selben Weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1227,6 +1232,6 @@
 msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -1234,5 +1239,5 @@
 "trennen zu können."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1242,5 +1247,5 @@
 "in der Mitte des Weges.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1251,5 +1256,5 @@
 "Sie sollten dies überprüfen und falls nötig korrigieren."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1314,5 +1319,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
-msgid "* One way that has one or more nodes that are used by more than one way, or"
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
 "* Einen Weg, der einen oder mehr Knoten hat, die von mehr als einem Weg "
@@ -1320,5 +1326,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
-msgid "* One way and one or more of its nodes that are used by more than one way."
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
 "* Einen Weg und einen oder mehr Knoten, die von mehr als einem Weg verwendet "
@@ -1389,8 +1396,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
 msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr "Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)"
+msgstr ""
+"Die aktuelle Datenebene mittels des Servers aktualisieren (neu herunterladen)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:71
-msgid "No data to update found. Have you already opened or downloaded a data layer?"
+msgid ""
+"No data to update found. Have you already opened or downloaded a data layer?"
 msgstr ""
 "Keine Daten zum Aktualisieren gefunden. Haben Sie bereits eine Datenebene "
@@ -1402,48 +1411,53 @@
 "This action will require {0} individual download requests. Do you wish to "
 "continue?"
-msgstr "Diese Aktion benötigt {0} individuelle Serverzugriffe. Wollen Sie fortfahren?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+msgstr ""
+"Diese Aktion benötigt {0} individuelle Serverzugriffe. Wollen Sie fortfahren?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Zum OSM-Server hochladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Alle Änderungen zum OSM-Server hochladen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Neue Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Geänderte Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Zu löschende Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Diese Änderungen hochladen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Änderungen hochladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Nichts geändert. Erfassen Sie erst einige Daten."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Es gibt ungelöste Konflikte, die zuerst aufgelöst werden müssen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Keine Änderungen zum Hochladen vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Daten werden hochgeladen"
@@ -1628,31 +1642,33 @@
 msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Knotenpunkt hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Knotenpunkt in einen Weg einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Existierenden Weg mit Knotenpunkt verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Einen Knotenpunkt in einen bestehenden Weg einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Knotenpunkt in einen Weg einfügen und verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Einen neuen Knoten erstellen."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Knoten unter Mauszeiger wählen."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1662,9 +1678,4 @@
 msgstr[1] "Neuen Knoten in {0} Wege einfügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Knoten unter Mauszeiger wählen."
-
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Start new way from last node."
@@ -1700,5 +1711,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr "Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
+msgstr ""
+"Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
@@ -1739,5 +1751,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 "Maustaste loslassen, um die Bewegung zu stoppen. Strg: mit dem nächsten "
@@ -1818,5 +1831,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr "<b>\"Berliner Straße\"</b> - 'Berliner Straße' in einem Schlüssel oder Namen."
+msgstr ""
+"<b>\"Berliner Straße\"</b> - 'Berliner Straße' in einem Schlüssel oder Namen."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
@@ -1837,6 +1851,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
-msgid "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr "<b>type:</b> - Typ des Objektes (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr ""
+"<b>type:</b> - Typ des Objektes (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
@@ -1870,9 +1886,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Nutzung von <b>|</b> oder <b>OR</b> zum Kombinieren mittels logischem Oder."
+msgstr ""
+"Nutzung von <b>|</b> oder <b>OR</b> zum Kombinieren mittels logischem Oder."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-msgstr "Nutzung von <b>\"</b> zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)"
+msgstr ""
+"Nutzung von <b>\"</b> zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
@@ -2083,5 +2101,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2276,5 +2294,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "Eisenbahn"
@@ -2296,127 +2314,127 @@
 msgstr[1] "{0} Knoten"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Flächenförmiger Weg ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygon-Weg ''{0}''  ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Leeres Element in der Relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Gelöschtes Element ''{0}'' in der Relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg ''{0}'' mit weniger als zwei Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Mehr als ein Weg mit \"from\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Mehr als ein Weg mit \"to\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "Mehr als ein Element mit \"via\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unbekannte Role \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unbekannter Elementtyp für \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Kein \"from\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Kein \"to\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "Kein \"via\"-Knoten oder Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Nicht-Weg ''{0}'' im Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Kein äußerer Weg im Multipolygon ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Innerer Weg \"{0}\" ist außerhalb."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "Ohne Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "Text"
@@ -2424,5 +2442,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2450,5 +2468,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "Hintergrund"
@@ -2515,5 +2533,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2527,5 +2545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2555,14 +2573,14 @@
 msgstr "neue Version:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Nachricht des Tages nicht verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "- aktive Version ist {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Nachricht des Tages herunterladen"
@@ -2606,6 +2624,6 @@
 "filename"
 msgstr ""
-"Daten laden. Kann x1,y1,x2,y2; eine URL mit lat=y&lon=x&zoom=z oder ein "
-"Dateiname sein."
+"Daten herunterladen. Das kann x1,y1,x2,y2; eine URL mit lat=y&lon=x&zoom=z "
+"oder ein Dateiname sein."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
@@ -2614,5 +2632,5 @@
 "lat=y&lon=x&zoom=z or a filename"
 msgstr ""
-"Alles als Roh-GPS-Daten laden. Kann x1,y1,x2,y2, eine URL mit "
+"Herunterladen als Roh-GPS-Daten. Das kann x1,y1,x2,y2, eine URL mit "
 "lat=y&llon=x&zoom=z oder ein Dateiname sein."
 
@@ -2622,6 +2640,6 @@
 "URL which returns osm-xml"
 msgstr ""
-"Alle zu der initialen Auswahl hinzufügen. Kann eine Google-ähnliche "
-"Suchanfrage oder eine URL auf ein osm-xml Dokument sein."
+"Alle zur aktuellen Auswahl hinzufügen. Das kann eine Google-ähnliche "
+"Suchanfrage oder eine URL auf ein osm-xml-Dokument sein."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -2631,17 +2649,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid "If specified, reset the configuration instead of reading it."
-msgstr "Wenn angegeben, wird die Konfiguration zurückgesetzt anstatt sie zu lesen."
+msgstr ""
+"Wenn ausgewählt, wird die Konfiguration zurückgesetzt anstatt sie zu "
+"verarbeiten."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Benutzername"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -2650,57 +2670,57 @@
 "genutzt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "Verwendung"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "Optionen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Diese Hilfe anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Bounding Box herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr "Ort an der URL herunterladen (mit lat=x&lon=y&zoom=z)"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Bounding Box als GPS-Spuren herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Mit der angegebenen Suche auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr "Mit maximiertem Fenster starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Standardwerte zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Die Sprache festlegen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "Beispiele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2711,23 +2731,28 @@
 "--selection verwendet wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Anstatt --download=<bbox> ist auch osm://<bbox> möglich\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Aktualisierte Plugins aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Zeitige Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Voreinstellungen setzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Plugins laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr "Einstellung {0} wird nicht länger benutzt und wurde deshalb entfernt."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2871,5 +2896,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96
-msgid "partial: different selected objects have different values, do not change"
+msgid ""
+"partial: different selected objects have different values, do not change"
 msgstr ""
 "teilweise: verschiedene gewählte Objekte haben verschiedene Werte, nicht "
@@ -2906,5 +2932,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -2920,5 +2946,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
-msgid "Set the selected elements on the map to the selected items in the list above."
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
 msgstr ""
 "Ausgewählte Elemente auf der Karte auf die obige Liste der ausgewählten "
@@ -2962,5 +2989,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
 msgid "History"
-msgstr "Versionsgeschichte"
+msgstr "Verlauf"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
@@ -3003,5 +3030,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80
 msgid "There are unsaved changes. Delete the layer anwyay?"
-msgstr "Es gibt ungesicherte Daten. Änderungen verwerfen und Ebene löschen?"
+msgstr "Änderungen sind nicht gespeichert. Ebene trotzdem löschen?"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
@@ -3116,5 +3143,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Rolle"
@@ -3162,73 +3189,71 @@
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Änderungen übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Neue Relation erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Neue Relation bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Relation #{0} bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Belegt durch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Merkmale (leerer Wert löscht das Merkmal)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Mitglieder"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Nach oben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Ausgewählte Mitglieder nach oben schieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Ausgewähltes hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Alle ausgewählten Objekte als Mitglieder hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Ausgewähltes entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Alle ausgewählten Objekte aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Nach unten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Ausgewählte Mitglieder nach unten schieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3237,36 +3262,36 @@
 msgstr "Entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Mitglied in der gewählten Tabellenzeile aus dieser Relation entfernen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Mitglieder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relationseditor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
-msgstr "Konflikte beim Importieren aufgetreten."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+msgstr "Es sind Konflikte beim Importieren aufgetreten."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Fehler beim Parsen der Serverantwort."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Kann nicht mit Server verbinden."
@@ -3280,10 +3305,11 @@
 msgstr "Gewählte Relation löschen"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relationen"
@@ -3356,5 +3382,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:208
-msgid "Close this panel. You can reopen it with the buttons in the left toolbar."
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 "Die Ansicht schließen. Neuöffnen mit den Schaltflächen in der linken "
@@ -3363,5 +3390,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
 msgid "Click to minimize/maximize the panel content"
-msgstr "Zum Minimieren des Inhalts der Ansicht klicken"
+msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53
@@ -3477,5 +3504,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Orte"
@@ -3522,21 +3549,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "Typ"
@@ -3558,5 +3585,5 @@
 msgstr ""
 "Zoom: Mausrad oder Doppelklick.   Karte bewegen: Rechte Maustaste halten und "
-"Maus bewegen.   Auswahl: Klick."
+"Maus bewegen.   Auswählen: Klick."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109
@@ -3591,10 +3618,7 @@
 "verschieben."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Karte"
@@ -3748,4 +3772,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3851,5 +3876,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3914,19 +3939,33 @@
 "der GPS-Spur entfernt waren, wurden ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "Außerhalb des heruntergeladenen Bereichs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, java-format
+msgid "version {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} gelöscht.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+msgid "unset"
+msgstr "nicht angegeben"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, java-format
+msgid "API version: {0}"
+msgstr "API-Version: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3934,21 +3973,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4005,5 +4044,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
-msgid "You need to pause audio at the moment when you hear your synchronization cue."
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 "Sie müssen die Tonwiedergabe auf Pause stellen, sobald Sie Ihren "
@@ -4091,5 +4131,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:60
 msgid "Default value currently unknown (setting has not been used yet)."
-msgstr "Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)."
+msgstr ""
+"Standardwert momentan unbekannt (Einstellung wurde noch nicht verwendet)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
@@ -4153,5 +4194,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
 msgid "Start of track (will always do this if no other markers available)."
-msgstr "GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)."
+msgstr ""
+"GPS-Spuranfang (wird immer genutzt, wenn keine anderen Marken verfügbar)."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:56
@@ -4171,5 +4213,6 @@
 "Put text labels against audio (and image and web) markers as well as their "
 "button icons."
-msgstr "Audio-Marken (und Bild- und Web-Marken) und deren Bildsymbole beschriften."
+msgstr ""
+"Audio-Marken (und Bild- und Web-Marken) und deren Bildsymbole beschriften."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
@@ -4221,5 +4264,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:155
 msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr "Der Faktor, um den die Geschwindigkeit bei schnellem Vorlauf erhöht wird"
+msgstr ""
+"Der Faktor, um den die Geschwindigkeit bei schnellem Vorlauf erhöht wird"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:156
@@ -4391,5 +4435,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4474,4 +4518,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4555,7 +4601,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4568,7 +4611,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4584,10 +4634,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4756,5 +4806,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4788,7 +4840,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4872,4 +4924,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4922,4 +4982,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4928,7 +4994,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4937,15 +5000,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4970,129 +5022,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Name"
@@ -5171,45 +5225,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Auto"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Fahrrad"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5217,25 +5261,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Zu Fuß"
@@ -5287,5 +5336,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
-msgid "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
+msgid ""
+"Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr ""
 "Maximallänge zum Linienzeichnen (in Meter). Verwenden Sie \"-1\", um alle "
@@ -5298,5 +5348,6 @@
 #. forceRawGpsLines
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:100
-msgid "Force drawing of lines if the imported data contain no line information."
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
 msgstr ""
 "Das Zeichnen von Linien erzwingen, wenn die importierten Daten keine Linien-"
@@ -5319,5 +5370,6 @@
 "Don't draw arrows if they are not at least this distance away from the last "
 "one."
-msgstr "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
+msgstr ""
+"Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
@@ -5566,5 +5618,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
-msgid "Login password to the OSM account. Leave blank to not store any password."
+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 "
@@ -5759,5 +5812,6 @@
 "<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
 "</p>"
-msgstr "<p>Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.</p>"
+msgstr ""
+"<p>Das Pseudo-Tastaturkürzel 'disabled' deaktiviert Tastaturkürzel.</p>"
 
 #. scroll up
@@ -5862,5 +5916,5 @@
 #, java-format
 msgid "Could not read tagging preset source: {0}"
-msgstr "Quelle für Objektvorlage kann nicht gelesen werden: {0}"
+msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:561
@@ -5922,10 +5976,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, vielleicht fehlende Merkmale."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Daten werden vorbereitet...."
@@ -5933,27 +5987,77 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287
 msgid "Parse error: invalid document structure for gpx document"
-msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Datei"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr "Diese JOSM-Version ist mit dem ein eingestellten Server inkompatibel."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+"JOSM unterstützt die Protokoll-Versionen 0.5 und 0.6, während der Server {0} "
+"bis {1} unterstützt."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr "Kommunikation mit {0} mittels Protokollversion {1} etabliert."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Öffne Änderungssatz..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Schließe Änderungssatz..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+msgid "No changeset present for diff upload"
+msgstr "Kein Änderungssatz zum Hochladen vorhanden"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Daten vorbereiten..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Daten hochladen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+msgid "Error processing changeset upload response"
+msgstr "Fehler beim Verbarbeiten des Änderungssatzes im Server"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr "Nicht initialisiert"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Rechner unbekannt"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Passwort oder Benutzername falsch."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Benutzername und Passwort (unverschlüsselt) speichern"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5964,44 +6068,53 @@
 msgstr "Fehler beim Parsen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Unbekannte Version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr "Fehlende Versionsnummer in OSM-Daten"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, java-format
+msgid "Unknown version: {0}"
+msgstr "Unbekannte Version: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Ein <nd> Element in einem Nicht-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> hat Null ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "<member>-Schlüssel bei einer Nicht-Relation gefunden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Unvollständige <member>-Beschreibung mit ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Illegales Objekt mit id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Erforderliches Attribut \"{0}\" nicht vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-msgstr "Überspringe einen Weg, weil er einen nichtexistenten Knoten besitzt: {0}\n"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+msgstr ""
+"Überspringe einen Weg, weil er einen nichtexistenten Knoten besitzt: {0}\n"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Falsch formatierte Knoten-ID"
@@ -6011,11 +6124,12 @@
 msgstr "Serververbindung..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
-msgid "Couldn't connect to the osm server. Please check your internet connection."
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
+msgid ""
+"Couldn't connect to the osm server. Please check your internet connection."
 msgstr ""
 "Verbindung zum OSM-Server fehlgeschlagen. Bitte prüfen sie ihre "
 "Internetverbindung."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6025,55 +6139,8 @@
 "kleineren Ausschnitt zu laden oder versuchen Sie es nach einiger Zeit erneut."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Änderungskommentar"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} verbleiben. Überspiele {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Ein Fehler ist aufgetreten: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Öffne Änderungssatz..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Server unterstützt keine Gruppenänderungen"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Rechner unbekannt"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Daten vorbereiten..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Daten hochladen..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Schließe Änderungssatz..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Übertragung wegen eines Fehlers abgebrochen (Wiederholung in 5 Sekunden):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6107,5 +6174,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:145
 #, java-format
-msgid "The plugin {0} seems to be broken or could not be downloaded automatically."
+msgid ""
+"The plugin {0} seems to be broken or could not be downloaded automatically."
 msgstr ""
 "Das Plugin {0} scheint fehlerhaft zu sein oder kann nicht automatisch "
@@ -6164,5 +6232,6 @@
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
+msgstr ""
+"Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
@@ -6180,5 +6249,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 #, java-format
-msgid "An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr ""
 "Eine unvorhergesehene Fehlersituation trat auf, die das Plugin \"{0}\" "
@@ -6191,5 +6261,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261
-msgid "Try updating to the newest version of this plugin before reporting a bug."
+msgid ""
+"Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 "Versuchen Sie zuerst eine Aktualisierung auf die neueste Version des "
@@ -6244,6 +6315,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "unbekannt"
@@ -6440,17 +6511,18 @@
 "in common"
 msgstr ""
+"Erstellt ein Netz von  Wegen basierend auf zwei existierenden, die "
+"verschiedene Punkte und einen gemeinsamen haben."
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Zwei Wege mit einem gemeinsamen Knoten wählen"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Zwei Wege mit maximal einem gemeinsamen Knoten wählen"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Gebiete erstellen"
+msgstr "Ein Wegegitter erstellen."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6474,5 +6546,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Beschreibung"
@@ -6514,5 +6586,6 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263
 msgid "Upload failed. Server returned the following message: "
-msgstr "Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: "
+msgstr ""
+"Hochladen fehlgeschlagen. Der Server hat folgene Meldung zurückgegeben: "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:305
@@ -6814,5 +6887,6 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713
-msgid "The selected GPX track doesn't contain timestamps. Please select another one."
+msgid ""
+"The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
 "Die gewählte GPS-Spur enthält keine Zeitstempel. Bitte wählen Sie eine "
@@ -7009,5 +7083,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr "<html>Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist</html>"
+msgstr ""
+"<html>Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
@@ -7066,5 +7141,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
 msgid "Oldest files are automatically deleted when this size is exceeded"
-msgstr "Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird"
+msgstr ""
+"Alte Dateien werden automatisch gelöscht wenn diese Größe überschritten wird"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
@@ -7757,7 +7833,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "Wasser"
@@ -7833,5 +7909,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
 msgid "Maximum number of segments allowed in each generated way. Default 250."
-msgstr "Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250."
+msgstr ""
+"Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
@@ -7861,5 +7938,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
-msgid "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 "Auflösung der Landsat-Kacheln, gemessen in Pixel pro Grad. Standard ist "
@@ -7898,5 +7976,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Maximum age of each cached file in days. Default is 100"
-msgstr "Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100"
+msgstr ""
+"Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
@@ -8062,5 +8141,5 @@
 msgstr "OpenStreetBugs Lade-Warteschleife"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugs-Einträge anzeigen"
@@ -8080,4 +8159,11 @@
 msgstr "Warnung"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Ein Fehler ist aufgetreten: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8109,35 +8195,40 @@
 "OpenStreetBugs abzurufen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Kommentar hinzufügen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Geben Sie einen Kommentar ein"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Problem als erledigt markieren"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Soll dieses Problem wirklich als ''erledigt''  markiert werden?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Wirklich schließen?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+"<html>Problem wirklich als \"erledigt\" markieren?<br><br>Sie können einen "
+"optionalen Kommentar angeben:</html>"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Neuer Fehler"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Fehler anlegen"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Beschreiben Sie den Fehler möglichst genau"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Fehler anlegen"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8166,5 +8257,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8174,9 +8265,9 @@
 "den Pfad zu Firefox ein."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "Einstellungen für Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Firefox-Programm"
@@ -8247,83 +8338,67 @@
 msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Navigation"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
-#, fuzzy
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 msgid "Routing"
-msgstr "Nichts"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-msgid "Click to add route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-msgid "Click and drag to move route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Doppelte Knoten entfernen..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
+msgstr "Routenführung"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
+msgid "Click to add destination."
+msgstr "Klicken, um Ziel hinzuzufügen."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr "Klicken und bewegen, um Ziel zu verschieben."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr "Klicken, um Ziel zu entfernen"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "Eine Liste aller Relationen öffnen."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Station"
+msgstr "Eine Liste von Routenknoten öffnen"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+msgid "Add routing layer"
+msgstr "Routing-Ebene hinzufügen"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "mittelschwer"
+msgstr "Kriterien"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Schuhe"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "Kürzeste"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Schneller"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "Schnellste"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Gebäudeteilung umkehren"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr "Route umdrehen"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Fährroute"
+msgstr "Route löschen"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Einstellungen für WMS-Plugin"
+msgstr "Einstellungen des Routenführungsplugins"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Pluginquellen bearbeiten"
+msgstr "Routenführung konfigurieren."
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Zufahrtsstraßentyp"
+msgstr "Straßentyp"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
@@ -8332,41 +8407,40 @@
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Höhe"
+msgstr "Gewicht"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "Gewichtswerte eingeben"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Karte"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Lade Kachel"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Kachelstatus anzeigen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Aktualisieren"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Alle Kacheln laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Zoom erhöhen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Zoom reduzieren"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "Bild nicht geladen"
@@ -8389,34 +8463,34 @@
 msgstr "Einstellungen für das Karten-Plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Quellen der Kacheln"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Automatisches Zoomen: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Kacheln automatisch laden: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Max. Zoomstufe: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Hintergrund ausblenden: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "Fehler beim Laden der Metadaten"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "Angefordert: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "Fehler bei der Aktualisierungsanforderung"
@@ -8431,5 +8505,5 @@
 msgstr "Aufgezeichnete Daten jede Minute speichern."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8448,5 +8522,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
 msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
-msgstr "Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!"
+msgstr ""
+"Das Surveyor-Plugin benötigt das LiveGPS-Plugin, konnte es aber nicht finden!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
@@ -8484,7 +8559,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Bundesland bearbeiten"
+msgstr "Merkmale bearbeiten"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8492,66 +8566,58 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Merkmalseditor aufrufen"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "JOSM Mermalseditorplugin"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "Kein"
+msgstr "(nichts)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "Hervorgehoben"
+msgstr "Hervorheben"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "Mehrfachnutzung"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr "<mehrere>"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Ändere Eigenschaften für bis zu {0} Objekt"
-msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] "Entferne alte Schlüssel von bis zu {0} Objekt"
+msgstr[1] "Entferne alte Schlüssel von bis zu {0} Objekten"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Ändere Eigenschaften für bis zu {0} Objekt"
-msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
+msgstr[0] "Eigenschaften von bis zu {0} Objekt aktualisieren"
+msgstr[1] "Eigenschaften von bis zu {0} Objekten aktualisieren"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "Route"
+msgstr "Gruppe"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Bach"
+msgstr "Element"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Suche"
+msgstr "Suche: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Datei"
+msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Auto"
+msgstr "Löschen"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8562,5 +8628,6 @@
 
 #: ../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."
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 "Testwerkzeug für Objektvorlagen öffnen, um eine Vorschau auf die Dialoge der "
@@ -8569,5 +8636,6 @@
 #: ../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 "Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben."
+msgstr ""
+"Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben."
 
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
@@ -8636,5 +8704,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Straßenname"
@@ -8735,24 +8803,21 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Knoten auf allen Schnittpunkten erstellt"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
+msgstr "Wege entfernen, die nicht teil des inneren Multipolygons sind"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "Relation"
+msgstr "Relationen korrigieren"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Überlappende Flächen verbinden"
+msgstr "Selbstüberlappende Gebiete verbunden"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Überlappende Flächen verbinden"
+msgstr "Überlappende Gebiete verbunden"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8765,31 +8830,26 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Konflikte auflösen."
+msgstr "Merkmalskonflikte beheben"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Aus der Relation entfernen"
+msgstr "Elemente aus Relationen entfernt"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Flächen verbinden: Kurze Wege entfernen"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Nicht geschlossene Wege."
+msgstr "Weg geschlossen"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Photo aus Ebene entfernen"
+msgstr "Entferne Merkmale von inneren Wegen"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Autobahnkreuz"
+msgstr "Funktion zum Flächen verbinden"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -8848,5 +8908,6 @@
 #, java-format
 msgid "The selection contains {0} way. Are you sure you want to simplify it?"
-msgid_plural "The selection contains {0} ways. Are you sure you want to simplify them all?"
+msgid_plural ""
+"The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr[0] ""
 "Diese Auswahl enthält {0} Weg. Sind Sie sich, dass er vereinfacht werden "
@@ -8907,5 +8968,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show the informational tests in the upload check windows."
-msgstr "Warnungen des Typs \"Information\" im Prüffenster beim Hochladen anzeigen."
+msgstr ""
+"Warnungen des Typs \"Information\" im Prüffenster beim Hochladen anzeigen."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
@@ -8921,5 +8983,6 @@
 "An OSM data validator that checks for common errors made by users and editor "
 "programs."
-msgstr "Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft."
+msgstr ""
+"Ein OSM-Datenprüfer, der auf häufige Fehler der Benutzer und Editoren prüft."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
@@ -9130,6 +9193,8 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
-msgid "This test checks for ways that contain some of their nodes more than once."
-msgstr "Dieser Test sucht nach Wegen, die einige ihrer Knoten mehrfach enthalten."
+msgid ""
+"This test checks for ways that contain some of their nodes more than once."
+msgstr ""
+"Dieser Test sucht nach Wegen, die einige ihrer Knoten mehrfach enthalten."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
@@ -9139,5 +9204,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:37
-msgid "This test checks for ways with similar names that may have been misspelled."
+msgid ""
+"This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 "Dieser Test prüft auf ähnlich benannte Wege, was auf Schreibfehler hinweisen "
@@ -9387,4 +9453,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9466,7 +9538,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "Gebäude"
@@ -9480,5 +9552,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "Fläche"
@@ -9689,5 +9761,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171
-msgid "The requested area is too big. Please zoom in a little, or change resolution"
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 "Das angeforderte Gebiet ist zu groß. Zoomen Sie ein wenig oder ändern Sie "
@@ -9788,4 +9861,11 @@
 msgstr "Aus der Eingabedatei konnten keine Audiodaten gelesen werden."
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+"Ihre Änderungen müssen frei verfügbar (public) gemacht werden, um neue Daten "
+"hochzuladen."
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9800,5 +9880,6 @@
 #: build/trans_plugins.java:5
 msgid "A special handler for the french land registry WMS server."
-msgstr "Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung."
+msgstr ""
+"Ein spezielles Plugin für die WMS-Server der französischen Landesvermessung."
 
 #. Plugin colorscheme
@@ -9819,7 +9900,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Gebiete erstellen"
+msgstr "Erzeugt ein Wegegitter."
 
 #. Plugin DirectUpload
@@ -9852,5 +9932,6 @@
 #: build/trans_plugins.java:17
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr "GPS-Daten vom Datenlogger Globalsat DG100 direkt in JOSM herunterladen."
+msgstr ""
+"GPS-Daten vom Datenlogger Globalsat DG100 direkt in JOSM herunterladen."
 
 #. Plugin grid
@@ -9877,5 +9958,6 @@
 #. Plugin livegps
 #: build/trans_plugins.java:25
-msgid "Support live GPS input (moving dot) through a connection to gpsd server."
+msgid ""
+"Support live GPS input (moving dot) through a connection to gpsd server."
 msgstr ""
 "Echtzeitunterstützung für GPS-Daten (bewegter Punkt) mittels einer "
@@ -9900,4 +9982,7 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
+"Simuliert einen Klick bei einer kleinen und kurzen Mausbewegung. Dies ist "
+"nützlich bei Tablets, wenn das Problem besteht, dass einfaches Klicken ohne "
+"Mausbewegung nur schwer möglich ist (generelles Java - Tablet Problem)"
 
 #. Plugin openlayers
@@ -9913,5 +9998,6 @@
 #. Plugin openvisible
 #: build/trans_plugins.java:35
-msgid "Allows opening gpx/osm files that intersect the currently visible screen area"
+msgid ""
+"Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 "Erlaubt das Öffnen von GPX- oder OSM-Dateien, welche den aktuellen Bereich "
@@ -9920,24 +10006,35 @@
 #. Plugin osmarender
 #: build/trans_plugins.java:37
-msgid "Launches FireFox to display the current visible screen as a nice SVG image."
-msgstr "Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen."
+msgid ""
+"Launches FireFox to display the current visible screen as a nice SVG image."
+msgstr ""
+"Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen."
+
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+"Dieses Plugin erlaubt es, beliebige Bilder als Hintergrund im Editor "
+"darzustellen und an der Karte zu orientieren."
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Das großartige Plastic-Design von JGoodies."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr "Erlaubt anderen Programmen Kommandos an JOSM zu senden."
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Bietet Routenführungsmöglichkeiten."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9948,15 +10045,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS Position einzufügen."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
+msgstr "Bietet einen Dialog um Merkmale in einer Tabelle zu editieren."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9964,17 +10061,20 @@
 "the jar-file as standalone as well."
 msgstr ""
+"Fügt dem Hilfemenü einen Objektvorlagentester hinzu. Dies hilft beim "
+"entwickeln von Objektvorlagen (kurze Vorschau des Dialogs). Sie können die "
+"Jar-Datei auch einzeln starten."
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr "TCX-Dateien direkt aus JOSM heraus laden."
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9986,5 +10086,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9995,5 +10095,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -10005,6 +10105,7 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
-msgid "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
+#: build/trans_plugins.java:65
+msgid ""
+"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
 msgstr ""
 "Zeigt georeferenzierte Bilder als Hintergrund in JOSM (WMS Server, "
@@ -10094,5 +10195,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Referenz"
@@ -10147,7 +10248,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Ebene"
@@ -10190,5 +10291,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Höchstgeschwindigkeit (km/h)"
@@ -10236,5 +10337,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Einbahnstraße"
@@ -10290,5 +10391,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brücke"
@@ -10338,5 +10439,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -10383,5 +10484,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Senke"
@@ -10428,5 +10529,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Straßendamm"
@@ -10584,6 +10685,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Breite (Meter)"
@@ -10632,5 +10733,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Oberfläche"
@@ -10662,5 +10763,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "geteert"
@@ -10671,5 +10772,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "unbefestigt"
@@ -10683,5 +10784,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "gepflastert"
@@ -10833,5 +10934,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10852,6 +10953,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "ja"
@@ -10995,7 +11096,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "nein"
@@ -11009,73 +11110,63 @@
 msgstr "Schwerlast (hgv)"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Pferd"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motorrad"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Automobil"
@@ -11150,130 +11241,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Typ"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11281,5 +11260,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11287,11 +11266,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11299,5 +11272,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11305,5 +11278,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11311,5 +11284,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11317,6 +11290,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11335,6 +11314,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "Autobahn"
@@ -11360,6 +11339,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "Schnellstraße"
@@ -11385,6 +11364,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "Bundesstraße"
@@ -11410,6 +11389,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "Landesstraße"
@@ -11423,5 +11402,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "Kreisstraße"
@@ -11439,5 +11418,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "Ortsstraße"
@@ -11455,5 +11434,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "Service"
@@ -11480,6 +11459,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "Baustelle"
@@ -11520,6 +11499,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11530,5 +11508,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -11872,14 +11850,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Betreiber"
@@ -11904,20 +11882,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "unkontrolliert"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "Ampel"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "Insel"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "unmarkiert"
@@ -11925,5 +11903,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "Zu Pferd"
@@ -11932,5 +11910,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "Mit Fahrrad"
@@ -11940,5 +11918,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "Begleitperson"
@@ -12087,10 +12065,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Höhe"
@@ -12103,29 +12082,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Zauntreppe"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Zauntreppe bearbeiten"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Poller"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Poller bearbeiten"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12134,7 +12102,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12143,235 +12114,223 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Erlaubter Verkehr:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr "Umlaufgitter"
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Steinblock"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Viehgitter"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Viehgitter bearbeiten"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "Busschleuse"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr "Spikes / Dornen"
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr "Spikes / Dornen bearbeiten"
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Mautstation"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Mautstation bearbeiten"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Grenzkontolle"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Grenzkontrolle bearbeiten"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Hecke"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Zaun"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Mauer"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Stadtmauer"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Stützmauer"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Eingang"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Eingang bearbeiten"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "Gatter / Tor"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "Gatter / Tor bearbeiten"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "Schlagbaum"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "Schlagbaum bearbeiten"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Drahtgatter"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Drahtgatter bearbeiten"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Fahrzeuggatter"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Fahrzeuggatter bearbeiten"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "Personengatter"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
 msgstr "Personengatter bearbeiten"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Drahtgatter"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Drahtgatter bearbeiten"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Poller"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Poller bearbeiten"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Zugbrücke"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Zugbrücke bearbeiten"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "Busschleuse"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Viehgitter"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Viehgitter bearbeiten"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr "Spikes / Dornen"
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr "Spikes / Dornen bearbeiten"
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Fallgatter"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Fallgatter bearbeiten"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "Gatter / Tor"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "Gatter / Tor bearbeiten"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr "Schlagbaum"
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr "Schlagbaum bearbeiten"
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Zauntreppe"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Zauntreppe bearbeiten"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Durchgangsschleuse"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Durchgangsschleuse bearbeiten"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Fahrzeuggatter"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Fahrzeuggatter bearbeiten"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr "Umlaufgitter"
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Hecke"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Zaun"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Steinblock"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Mauer"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Stadtmauer"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Stützmauer"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Mautstation"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Mautstation bearbeiten"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Grenzkontolle"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Grenzkontrolle bearbeiten"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Eingang"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Eingang bearbeiten"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Wasser"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Quelle"
@@ -12379,5 +12338,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Quelle bearbeiten"
@@ -12385,5 +12344,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Abwassergraben"
@@ -12391,10 +12350,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Abwassergraben bearbeiten"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Bach"
@@ -12402,10 +12361,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Bach bearbeiten"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Kanal"
@@ -12413,10 +12372,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Kanal bearbeiten"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Fluß"
@@ -12426,5 +12385,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Fluss bearbeiten"
@@ -12432,15 +12391,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Wasserfläche bearbeiten"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Landfläche bearbeiten"
@@ -12448,15 +12407,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Wasserbecken"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Wasserbecken bearbeiten"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Speicherbecken"
@@ -12464,15 +12423,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Speicherbecken bearbeiten"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Überdecktes Speicherbassin"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Überdecktes Speicherbassin bearbeiten"
@@ -12480,5 +12439,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Flußbett"
@@ -12487,10 +12446,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Flußbett bearbeiten"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Feuchtgebiet"
@@ -12501,56 +12460,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Feuchtgebiet bearbeiten"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "Sumpf"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "Moor"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "Marsch"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "Röhricht"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "Salzwiese"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "Watt"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "Mangroven"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Schlick & Moor"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Schlickiges Gebiet bearbeiten"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Strand"
@@ -12558,20 +12517,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Strand bearbeiten"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Meeresbucht"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Meeresbucht bearbeiten"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Klippe"
@@ -12579,10 +12538,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Klippe bearbeiten"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Küstenlinie"
@@ -12590,5 +12549,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Küstenlinie bearbeiten"
@@ -12596,5 +12555,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Fährroute"
@@ -12602,5 +12561,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Fährroute bearbeiten"
@@ -12609,5 +12568,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Bootswerft"
@@ -12615,10 +12574,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Bootswerft bearbeiten"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Dock"
@@ -12626,5 +12585,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Dock bearbeiten"
@@ -12632,5 +12591,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Damm"
@@ -12638,15 +12597,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Damm bearbeiten"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Gewässerpunkte"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Schleusentor"
@@ -12655,5 +12614,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Wehr"
@@ -12661,20 +12620,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Wehr bearbeiten"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Wasserfall"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Wasserfall bearbeiten"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Wendepunkt"
@@ -12683,15 +12642,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Jachthafen"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Jachthafen bearbeiten"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Anlegestelle (Pier)"
@@ -12699,10 +12658,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Anlegestelle (Pier) bearbeiten"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Fährstelle"
@@ -12710,10 +12669,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Fährstelle bearbeiten"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Bootshebeanlage"
@@ -12723,5 +12682,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Bootshebeanlage bearbeiten"
@@ -12729,10 +12688,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Eisenbahn"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Eisenbahn"
@@ -12740,5 +12699,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Eisenbahn bearbeiten"
@@ -12768,8 +12727,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Optionale Typen"
@@ -12783,35 +12742,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "Rangiergleis"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "Abstellgleis"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "Firmenanschlußgleis"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Schmalspurbahn"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Schmalspurbahn bearbeiten"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Einschienenbahn"
@@ -12819,45 +12778,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Einschienenbahn bearbeiten"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Museumsbahn"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Museumsbahn bearbeiten"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "S-Bahn"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "S-Bahn bearbeiten"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "U-Bahn"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "U-Bahn bearbeiten"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Straßenbahn"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Straßenbahn bearbeiten"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Spurbus"
@@ -12865,5 +12824,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Spurbusstrecke bearbeiten"
@@ -12872,14 +12831,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Stillgelegte Strecke"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Stillgelegte Strecke bearbeiten"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Strecke abgebaut"
@@ -12888,5 +12847,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Bahnübergang"
@@ -12895,5 +12854,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "(Fuß-)Übergang"
@@ -12903,5 +12862,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr "Type des Übergangs"
@@ -12909,5 +12868,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Drehscheibe"
@@ -12916,10 +12875,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Seilbahnen"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Sessellift"
@@ -12927,10 +12886,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Sessellift bearbeiten"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Schlepplift"
@@ -12938,35 +12897,47 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Schlepplift bearbeiten"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
+msgstr "Seilbahn"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
+#: build/trans_presets.java:1328
+msgid "Edit Cable Car"
+msgstr "Seilbahn bearbeiten"
+
+#. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
 msgstr "Gondelbahn"
 
 #. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
-msgid "Edit Cable Car"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+msgid "Edit Gondola"
 msgstr "Gondelbahn bearbeiten"
 
-#. item "Aerialway/Cable Car" text "Name"
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Station"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Bahnhof bearbeiten"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Tankstelle"
@@ -12976,5 +12947,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Tankstelle bearbeiten"
@@ -12990,5 +12961,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12998,5 +12969,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Parken bearbeiten"
@@ -13004,40 +12975,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Kapazität"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "ebenerdig"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "Parkhaus"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "Tiefgarage"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "Park&Ride"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Behindertenparkplätze"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Gebühr"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Autowäsche"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Autowäsche bearbeiten"
@@ -13045,5 +13017,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Geschäft"
@@ -13051,15 +13023,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Autohaus bearbeiten"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Werkstatt"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Autowerkstatt bearbeiten"
@@ -13067,5 +13039,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Vermietung"
@@ -13074,10 +13046,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Autovermietung bearbeiten"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Autotausch / Car Sharing"
@@ -13085,5 +13057,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Autotausch (Car Sharing) bearbeiten"
@@ -13091,5 +13063,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Fahrradparkplatz bearbeiten"
@@ -13098,5 +13070,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Fahrradleihstelle bearbeiten"
@@ -13105,15 +13077,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Fahrradladen bearbeiten"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Öffentliche Verkehrsmittel"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Referenz"
@@ -13121,5 +13093,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Eisenbahnhaltepunkt"
@@ -13127,5 +13099,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Haltepunkt bearbeiten"
@@ -13133,5 +13105,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Straßenbahnhaltestelle"
@@ -13140,5 +13112,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Straßenbahnhaltestelle bearbeiten"
@@ -13146,5 +13118,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Bahnsteig"
@@ -13153,5 +13125,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Bahnsteig bearbeiten"
@@ -13163,5 +13135,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "Referenznummer (Steig)"
@@ -13169,10 +13141,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Fläche"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "U-Bahn-Eingang"
@@ -13181,10 +13153,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "U-Bahn-Eingang bearbeiten"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Rollstuhl"
@@ -13193,5 +13165,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Busbahnhof"
@@ -13200,5 +13172,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Busbahnhof bearbeiten"
@@ -13206,5 +13178,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Bushaltestelle"
@@ -13214,5 +13186,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Bushaltestelle bearbeiten"
@@ -13220,10 +13192,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Bussteig"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Bussteig bearbeiten"
@@ -13231,5 +13203,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13237,5 +13209,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Taxihaltepunkt bearbeiten"
@@ -13243,5 +13215,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Flughafen"
@@ -13249,15 +13221,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Flughafen bearbeiten"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13266,5 +13238,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Unterkunft"
@@ -13276,5 +13248,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -13283,15 +13255,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Hotel bearbeiten"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Sterne"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motel"
@@ -13299,20 +13271,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Motel bearbeiten"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Gästehaus (Bed & Breakfast)"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Gästehaus bearbeiten"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Ferienhaus"
@@ -13320,10 +13292,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Ferienhaus bearbeiten"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Jugendherberge"
@@ -13331,30 +13303,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Jugendherberge bearbeiten"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Alpenhütte"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Alpenhütte bearbeiten"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Wohnwagenstellplätze"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Wohnwagenstellplätze bearbeiten"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Campingplatz"
@@ -13362,10 +13334,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Campingplatz bearbeiten"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
@@ -13376,5 +13348,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -13382,5 +13354,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Restaurant bearbeiten"
@@ -13388,5 +13360,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Küche"
@@ -13394,61 +13366,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italienisch"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -13456,9 +13428,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Café"
@@ -13466,10 +13438,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Café bearbeiten"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Kneipe"
@@ -13477,20 +13449,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Kneipe bearbeiten"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "Bar"
@@ -13498,10 +13470,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "Bar bearbeiten"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -13509,20 +13481,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Nachtclub bearbeiten"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
@@ -13531,11 +13503,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "Museum"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "Museum bearbeiten"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "Zoo"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "Zoo bearbeiten"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "Aussichtspunkt"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "Aussichtspunkt bearbeiten"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Aussichtsturm"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "Themenpark"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "Themenpark bearbeiten"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "Kunstausstellung"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "Kunstausstellung bearbeiten"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "Informationsbüro"
@@ -13543,143 +13576,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
 msgstr "Informationsbüro bearbeiten"
 
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "Museum"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "Museum bearbeiten"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "Zoo"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "Zoo bearbeiten"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "Aussichtspunkt"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "Aussichtspunkt bearbeiten"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Aussichtsturm"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "Themenpark"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "Themenpark bearbeiten"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "Kunstausstellung"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "Kunstausstellung bearbeiten"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr "Kartentyp"
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr "Karte"
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr "Stadtplan"
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr "Wanderkarte"
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr "Fahrradkarte"
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr "Nähere Beschreibung"
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr "Informationstafel"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr "Tafeltyp"
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr "Infotafel"
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr "Geschichte"
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr "Natur"
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr "Wildtiere"
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr "Wegweiser (Wandern)"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr "Kartentyp"
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr "Karte"
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr "Stadtplan"
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr "Wanderkarte"
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr "Fahrradkarte"
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr "Nähere Beschreibung"
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr "Informationstafel"
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr "Tafeltyp"
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr "Infotafel"
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr "Geschichte"
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr "Natur"
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr "Wildtiere"
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Schutzraum"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Schutzraum bearbeiten"
@@ -13687,25 +13660,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Feuerstelle"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Picknickplatz"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Picknickplatz bearbeiten"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -13714,20 +13687,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -13736,20 +13709,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Ausgrabungsstelle bearbeiten"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Schlachtfeld"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Schlachtfeld bearbeiten"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -13757,56 +13742,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Schlachtfeld"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Schlachtfeld bearbeiten"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Spielplatz"
@@ -13814,15 +13788,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
@@ -13830,15 +13804,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -13852,6 +13826,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -13930,4 +13904,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14219,28 +14201,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "Sport"
@@ -14250,227 +14233,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "American Football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -14509,191 +14492,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "Spielfeld"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Radfahren"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Motorsportplatz bearbeiten"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Skifahren"
@@ -14701,56 +14684,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+msgid "intermediate"
 msgstr "mittelschwer"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "Schießen"
@@ -14758,178 +14741,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "American Football"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "American Football-Platz bearbeiten"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Australian Foootball-Platz bearbeiten"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Rugbyplatz bearbeiten"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Gebäude"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Gebäude"
@@ -14937,5 +14920,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -14943,10 +14926,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäuden bearbeiten"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Rathaus"
@@ -14954,10 +14937,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Botschaft"
@@ -14965,10 +14948,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Gericht"
@@ -14977,10 +14960,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Gefängnis"
@@ -14989,10 +14972,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Polizei"
@@ -15002,10 +14985,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -15014,10 +14997,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Post"
@@ -15025,5 +15008,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
@@ -15031,15 +15014,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Schule"
@@ -15047,10 +15030,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Universität"
@@ -15058,10 +15041,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Hochschule"
@@ -15069,5 +15052,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "College bearbeiten"
@@ -15075,5 +15058,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Kino"
@@ -15082,10 +15065,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Bibliothek"
@@ -15094,10 +15077,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -15105,10 +15088,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Theater"
@@ -15117,10 +15100,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -15130,5 +15113,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -15137,6 +15120,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Religion"
@@ -15145,66 +15128,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "zoroastrisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Konfession"
@@ -15213,81 +15196,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "sunnitisch"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Adressen"
@@ -15296,5 +15279,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Adressinformationen bearbeiten"
@@ -15302,5 +15285,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Hausnummer"
@@ -15308,20 +15291,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Hausname"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
-msgstr "Stadtname"
+msgstr "Ortsname"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Länderkennung"
@@ -15329,5 +15312,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -15336,5 +15319,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Adressinterpolation bearbeiten"
@@ -15342,67 +15325,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "alle"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+msgid "alphabetic"
+msgstr "alphabetisch"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Turm"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -15410,10 +15397,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Windmühle"
@@ -15421,10 +15408,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -15432,10 +15419,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -15445,10 +15432,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -15456,10 +15443,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Bake"
@@ -15467,10 +15454,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -15478,10 +15465,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -15489,5 +15476,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
@@ -15495,5 +15482,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -15503,39 +15490,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "Gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -15544,10 +15531,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -15556,5 +15543,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -15562,10 +15549,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Strommast"
@@ -15576,5 +15563,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
@@ -15582,5 +15569,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -15589,25 +15576,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Spannung"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Leitungsanzahl"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Toiletten"
@@ -15615,25 +15602,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Referenznummer"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Benutzungsgebühr"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telefon"
@@ -15642,5 +15624,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
@@ -15648,5 +15630,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Münzen"
@@ -15654,5 +15636,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Scheine"
@@ -15660,5 +15642,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -15666,5 +15648,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -15672,15 +15654,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -15689,5 +15671,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -15695,35 +15677,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Kleidung"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Bank"
@@ -15732,20 +15714,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Versteck"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Schloß"
@@ -15753,22 +15735,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -15777,10 +15759,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -15789,10 +15771,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -15800,25 +15782,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -15826,10 +15808,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Tante-Emma-Laden bearbeiten"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -15837,10 +15819,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Kiosk bearbeiten"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -15848,5 +15830,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Automaten bearbeiten"
@@ -15854,88 +15836,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Automatenprodukte"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Fleischer"
@@ -15943,10 +15925,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Fleischer bearbeiten"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Bäcker"
@@ -15954,10 +15936,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Bäcker bearbeiten"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Blumenladen"
@@ -15965,70 +15947,81 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Blumenladen bearbeiten"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "Bioladen"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Bioladen bearbeiten"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+msgid "Alcohol"
+msgstr "Spirituosen"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+msgid "Edit Alcohol Shop"
+msgstr "Spirituosengeschäft bearbeiten"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Getränke"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+msgid "Edit Beverages Shop"
 msgstr "Getränkeladen bearbeiten"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Computergeschäft bearbeiten"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Elektronikgeschäft"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Elektronikgeschäft bearbeiten"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Hifi-Geschäft bearbeiten"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Mobiliar"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Möbelgeschäft bearbeiten"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Gartenzentrum"
@@ -16036,10 +16029,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Gartenzentrum bearbeiten"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "Haushaltswaren"
@@ -16047,10 +16040,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "Haushaltswaren bearbeiten"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Heimwerkerbedarf"
@@ -16058,60 +16051,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 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:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Bürobedarf"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Bürobedarf bearbeiten"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Friseur"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Friseur bearbeiten"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Schuhe"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Schuhladen bearbeiten"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Spielzeug"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Spielzeuggeschäft bearbeiten"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "Videoverleih"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "Videogeschäft bearbeiten"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Chemische Reinigung"
@@ -16119,10 +16112,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Chemische Reinigung bearbeiten"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Waschsalon"
@@ -16130,10 +16123,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Waschsalon bearbeiten"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Camping (Outdoor)"
@@ -16141,35 +16134,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
+#: build/trans_presets.java:2519
+msgid "Sports"
 msgstr "Sport"
 
 #. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Sportgeschäft bearbeiten"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Optiker bearbeiten"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Geld"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Bank"
@@ -16177,5 +16170,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Bank bearbeiten"
@@ -16183,10 +16176,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Geldautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -16194,5 +16187,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Wechselstube bearbeiten"
@@ -16200,15 +16193,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomat bearbeiten"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Gesundheit"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Arzt"
@@ -16216,20 +16209,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Arzt bearbeiten"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -16237,5 +16230,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Apotheke bearbeiten"
@@ -16243,10 +16236,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "Rezepteinlösung"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -16254,10 +16247,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Krankenhaus bearbeiten"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -16266,5 +16259,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -16273,20 +16266,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -16294,5 +16287,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -16301,25 +16294,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Staat"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
@@ -16327,45 +16320,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Bundesland"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Landkreis"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Großstadt"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Stadt"
@@ -16373,10 +16367,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -16384,30 +16378,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Dorf"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -16415,10 +16410,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Insel"
@@ -16426,5 +16421,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
@@ -16432,5 +16427,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -16438,10 +16433,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Höhleneingang bearbeiten"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Bergspitze"
@@ -16449,10 +16444,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Bergspitze bearbeiten"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Gletscher"
@@ -16460,10 +16455,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Gletscher bearbeiten"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Vulkan"
@@ -16471,70 +16466,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Vulkan bearbeiten"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Staat"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Zivil"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr "Politisch"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Baum"
@@ -16543,15 +16538,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Baum bearbeiten"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Naturwald"
@@ -16560,5 +16555,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Naturwald bearbeiten"
@@ -16566,17 +16561,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "Nadelwald"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "Mischwald"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Forst"
@@ -16585,19 +16580,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Forst bearbeiten"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Geröll"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Geröll bearbeiten"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Buschland"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Buschland bearbeiten"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Gebirge"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Gebirge bearbeiten"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Heide"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Heide bearbeiten"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -16606,70 +16645,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Garten"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Gras"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -16677,10 +16717,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -16688,20 +16728,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -16709,5 +16749,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -16715,15 +16755,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -16731,9 +16771,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -16741,39 +16781,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -16781,114 +16821,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Militärgebiet"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Militärgebiet bearbeiten"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Baustellengebiet"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Baustelle bearbeiten"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Baustellengebiet"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Baustelle bearbeiten"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Militärgebiet"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Militärgebiet bearbeiten"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Geröll"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Geröll bearbeiten"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Buschland"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Buschland bearbeiten"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Gebirge"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Gebirge bearbeiten"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Heide"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Heide bearbeiten"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -16898,5 +16895,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -16905,10 +16902,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "Äußeres Segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -16916,5 +16913,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -16923,5 +16920,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -16929,34 +16926,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -16965,15 +16962,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "Zu Weg"
@@ -16981,5 +16978,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Route"
@@ -16988,5 +16985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -16994,5 +16991,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Routentyp"
@@ -17064,24 +17061,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "Ski"
@@ -17126,4 +17123,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17133,19 +17133,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "Fuß"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "Wandern"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "Umleitung"
@@ -17159,10 +17160,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -17170,26 +17171,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -17198,30 +17199,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
@@ -17405,4 +17406,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17414,4 +17522,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17513,11 +17630,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "veraltet"
@@ -17559,7 +17678,221 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "Pferd"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+msgid "barrier"
+msgstr "Barriere"
 
 #. color tertiary
@@ -17595,6 +17928,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "Straße"
@@ -17650,7 +17983,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "Weg"
@@ -17697,108 +18030,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "Eisenbahn"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "Viadukt"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17815,4 +18061,9 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+msgid "services"
+msgstr "Service"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17822,4 +18073,9 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+msgid "ford"
+msgstr "Furt"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17836,8 +18092,21 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "Wendekreis"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
+msgstr "Notfallrettungspunkt"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17849,5 +18118,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "Flussufer"
@@ -17861,5 +18130,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "Fluss"
@@ -17873,5 +18142,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "Dock"
@@ -17899,5 +18168,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "Aquädukt"
@@ -17912,4 +18181,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17949,5 +18219,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18064,12 +18334,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "Zivilisationsbauten"
@@ -18115,5 +18386,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18131,7 +18402,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr "Eisenbahnpunkt"
@@ -18154,10 +18425,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr "Andere Bahnen"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr "Eisenbahn-Überlagerung"
@@ -18187,6 +18458,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr "Alte Eisenbahn"
@@ -18231,6 +18502,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "Rollweg"
@@ -18244,5 +18515,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "Terminal"
@@ -18264,5 +18535,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "Rollweg (dunkel)"
@@ -18276,5 +18547,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "Rollweg (hell)"
@@ -18297,4 +18568,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18314,4 +18593,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "Luftweg"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18320,23 +18605,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "Luftweg"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "Einfache Piste"
@@ -18350,5 +18622,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "Mittelschwere Piste"
@@ -18362,7 +18635,8 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
-msgstr "Expertenpiste"
+msgstr "Fortgeschrittenenpiste"
 
 #. color piste_advanced
@@ -18373,6 +18647,20 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+msgid "piste_expert"
+msgstr "Expertenpiste"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "freie Piste"
@@ -18386,5 +18674,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "Anfängerpiste"
@@ -18415,4 +18704,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18447,4 +18744,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18457,8 +18778,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "Strom"
@@ -18471,5 +18794,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "Anlegestelle (Pier)"
@@ -18483,5 +18809,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "Pipeline"
@@ -18609,12 +18935,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "Freizeit"
@@ -18628,5 +18954,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "Jachthafen"
@@ -18698,8 +19024,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "Einrichtungen"
@@ -18735,4 +19061,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18792,11 +19126,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "Verkehrseinrichtungen"
@@ -18935,6 +19269,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19161,22 +19516,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "Einrichtungen (hell)"
@@ -19208,6 +19563,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "Wasser (hell)"
@@ -19243,4 +19598,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19260,7 +19623,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "Gesundheit"
@@ -19354,4 +19718,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19554,4 +19926,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19585,28 +19973,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "Geschäft"
@@ -19660,4 +20050,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19670,8 +20068,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "Hotel"
@@ -19726,4 +20124,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19820,9 +20219,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "Tourismus"
@@ -19894,8 +20293,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "Historisch"
@@ -19965,9 +20364,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "Grün"
@@ -19981,5 +20380,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "Steinbruch"
@@ -19993,5 +20392,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -20013,5 +20412,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "Wasserbecken"
@@ -20025,5 +20424,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "Forst"
@@ -20037,5 +20436,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "Farmland"
@@ -20058,5 +20457,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "Einkaufsbereich"
@@ -20070,5 +20469,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -20082,5 +20481,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "Baulücke"
@@ -20094,5 +20493,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "Bauland"
@@ -20106,5 +20505,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -20161,7 +20560,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "Militär"
@@ -20175,5 +20574,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "Friedhof"
@@ -20186,5 +20585,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "Berggipfel"
@@ -20199,5 +20598,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "Gletscher"
@@ -20211,5 +20610,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "Vulkan"
@@ -20224,4 +20623,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20263,7 +20663,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "Natur"
@@ -20277,5 +20678,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "Buschland"
@@ -20289,5 +20690,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "Heide"
@@ -20301,5 +20702,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "Naturwald"
@@ -20313,5 +20714,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -20325,5 +20726,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "Strand"
@@ -20401,8 +20802,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "Route"
@@ -20450,7 +20851,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "Grenze"
@@ -20592,10 +20993,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "Ort"
@@ -20636,6 +21037,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "Adresse"
@@ -20917,2 +21325,5 @@
 msgstr "Straßen NRW Geofabrik.de"
 
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Öffnen..."
Index: /applications/editors/josm/i18n/po/el.po
===================================================================
--- /applications/editors/josm/i18n/po/el.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/el.po	(revision 14844)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
 "PO-Revision-Date: 2009-03-18 19:00+0000\n"
 "Last-Translator: alichani <alichani@yahoo.co.uk>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:54+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Δημιουργία κύριου GUI"
@@ -37,38 +37,38 @@
 "Αδυναμία ανάγνωσης προβολής από τις προτιμήσεις. Θα χρησιμοποιηθεί EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Μη αποθηκευμένες αλλαγές"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Υπάρχουν μη αποθηκευμένες αλλαγές. Απόρριψη αλλαγών και συνέχεια;"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Αποθήκευση και Έξοδος"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Απόρριψη και Έξοδος"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -79,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -93,4 +93,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -100,10 +101,10 @@
 msgstr "Ακύρωση"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -129,8 +130,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -271,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -403,6 +404,6 @@
 msgstr "Αντισροφή και Συνδυασμός"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -410,20 +411,20 @@
 msgstr "Εισάγετε τιμές για όλες τισ διενέξεις."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Επίλυση διενέξεων"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Όλοι οι δρόμοι ήταν άδειοι"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -524,5 +525,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -643,6 +644,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -651,6 +652,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -776,9 +777,9 @@
 msgstr "Επιβεβαίωση συγχώνευσης"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1054,5 +1055,5 @@
 msgstr "Αποθήκευση τεχόντων δεδομένων."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1062,26 +1063,26 @@
 "αναφέρετε το σαν σφάλμα."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Δεν υπάρχει ανοιχτό έγγραφο και τίποτα προς αποθήκευση."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Κενό έγγραφο"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Το έγγραφο δεν περιέχει δεδομένα."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Επιβεβαίωση αποθήκευσης"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Συγκρούσεις"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1089,32 +1090,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Απόρριψη διενέξεων και Αποθήκευση"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Αποθήκευση αρχείου GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Αποθήκευση αρχείου OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Αδυναμία δημιουργίας αντιγράφου ασφαλείας."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Άγνωστη επέκταση αρχείου."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Δημιοθργήθηκε σφάλμα κατά την επαναφορά αντιγράφου ασφαλείας."
@@ -1168,18 +1169,18 @@
 msgstr "Κλείσιμο"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1187,5 +1188,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1197,9 +1198,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1207,10 +1208,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1218,5 +1219,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1224,5 +1225,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1374,46 +1375,50 @@
 "συνεχίσετε;"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Αποστολή προς OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Αντικείμενα που θα προστεθούν:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Αντικείμενα που θα αλλαχτούν"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Αντικείμενα που θα διαγραφούν:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Να αποσταλούν αυτές οι αλλαγές;"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Αποστολή Αλλαγών"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Υπάρχουν ανεπίλυτες διενέξεις. Πρέπει να τις επιλύσετε πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Αποστολή δεδομένων"
@@ -1596,31 +1601,33 @@
 msgstr "Δεν μπορείτε να προσθέσετε κόμβο εκτός κόσμου."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Προσθήκη κόμβου"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Δημιοθργία νέου κόμβου."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Επιλογή κόμβου στο σημείο του κέρσορα."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1629,9 +1636,4 @@
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Επιλογή κόμβου στο σημείο του κέρσορα."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2050,5 +2052,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2243,5 +2245,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "σιδηρόδρομος"
@@ -2263,127 +2265,127 @@
 msgstr[1] "{0} κόμβοι"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Άδειο μέλος στη σχέση."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Άγνωστος ρόλος \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Οδός \"από\" δεν βρέθηκε."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "Χωρίς ετικέτα"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "κείμενο"
@@ -2391,5 +2393,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2417,5 +2419,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "φόντο"
@@ -2482,5 +2484,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2494,5 +2496,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2522,14 +2524,14 @@
 msgstr "επιλυμένη έκδοση:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Το μήνυμα της ημέρας δεν είναι διαθέσιμο"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Λήψη \"Μηνύματος Ημέρας\""
@@ -2597,71 +2599,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Κωδικός"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "χρήση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "Επιλογές"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Εμφάνιση αυτής της βοήθειας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Λήψη της τοποθεσίας στο URL (με lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Άνοιγμα αρχείου (ως ακατέργαστο gps, αν είναι .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Επιλογή με την δοθείσα αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Ρυθμίστε την γλώσσα."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "παραδείγματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2672,24 +2674,29 @@
 "ότι φορτώσατε δεδομένα πριν το --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 "Αντί για το --download=<bbox> μπορείτε να καθορίσεται το osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Ενεργοποίηση ενημερωμένων πρόσθετων"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+msgid "Loading early plugins"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
-msgid "Loading early plugins"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Setting defaults"
 msgstr "Ρύθμιση προκαθορισμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Φόρτωση πρόσθετων"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2867,5 +2874,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3080,5 +3087,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Ρόλος"
@@ -3126,73 +3133,71 @@
 msgstr "Ιδιότητες / Υπαγωγές"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Εφαρμογή αλλαγών"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Δημιουργία νέας σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Επεξεργασία νέας σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Επεξεργασία σχέσης #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Βασικό"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Κατεχόμενο από"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Ετικέτες (κενή τιμή διαγράφει την ετικέτα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Μέλη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Μετακίνηση Πάνω"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Προσθήκη επιλεγμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Προσθήκη επιλεγμένων αντικειμένων ως μέλη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Αφαίρεση Επιλεγμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Αφαίρεση όλων των επιλεγμένων αντικειμένων από την σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Μετακίνηση Κάτω"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Μετακίνηση των επιλεγμένων μελών κάτω"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3201,36 +3206,36 @@
 msgstr "Αφαίρεση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Λήψη μελών"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Μέλη: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Επεξεργαστής Σχέσεων: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Υπήρχαν συγκρούσεις στην εισαγωγή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Αδυναμία σύνδεσης με το διακομιστή"
@@ -3244,10 +3249,11 @@
 msgstr "Διαγραφή της επιλεγμένης σχέσης"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Σχέσεις"
@@ -3444,5 +3450,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Τοποθεσίες"
@@ -3489,21 +3495,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "τύπος"
@@ -3554,10 +3560,7 @@
 msgstr ""
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Χάρτης"
@@ -3711,4 +3714,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3814,5 +3818,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3872,19 +3876,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "εκτός περιοχής λήψης"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Έκδοση {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "το {0} αποτελείται από:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} διαγράφηκαν.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "χρήση"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Έκδοση {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3892,21 +3911,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4333,5 +4352,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4416,4 +4435,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4497,7 +4518,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4510,7 +4528,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4526,10 +4551,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4698,5 +4723,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4730,7 +4757,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4814,4 +4841,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4864,4 +4899,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4870,7 +4911,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4879,15 +4917,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4912,129 +4939,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Όνομα"
@@ -5083,12 +5112,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Φόρτωση όλων των πλακιδίων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Ζώνη"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5115,45 +5142,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Αυτοκίνητο"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Ποδήλατο"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5161,25 +5178,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Πεζοί"
@@ -5227,7 +5249,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Σχεδιασμός γραμμών ανάμεσα σε ακατέργαστα σημεία GPS."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5835,10 +5856,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, πιθανόν να λείπουν κάποιες ετικέτες"
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Προετοιμασία δεδομένων..."
@@ -5848,25 +5869,75 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Άνοιγμα πακέτου αλλαγών..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Προετοιμασία..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Αποστολή..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Σφάλμα κατά την ανάλυση της απάντησης του διακομιστή."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Άγνωστος υπολογιστής"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Λανθασμένος κωδικός ή όνομα χρήστη"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Προειδοποίηση: Ο κωδικός μεταδίδεται χωρίς κρυπτογράφηση"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Αποθήκευση χρήστη και κωδικού (χωρίς κρυπτογράφηση)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5877,44 +5948,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Άγνωστη έκδοση"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Άγνωστη έκδοση"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> έχει μηδενική αναφορά"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Βρέθηκε <member> στοιχείο εκτός σχέσης."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Άγνωστο αντικείμενο με id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Ανύπαρκτο απαιτούμενο χαρακτηριστικό \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Προετοιμασία δεδομένων OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Κακοσχηματισμένο id κόμβου"
@@ -5924,5 +6003,5 @@
 msgstr "Επικοινωνία με τον Διακομιστή..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -5931,5 +6010,5 @@
 "Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5939,56 +6018,8 @@
 "ξαναδοκιμάστε αργότερα."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Οριστικοποίηση σχολίου"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} απομένουν. Αποστολή {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Προέκυψε σφάλμα: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Άνοιγμα πακέτου αλλαγών..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Ο διακομιστής δεν υποστηρίζει πακέτα αλλαγών"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Άγνωστος υπολογιστής"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Προετοιμασία..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Αποστολή..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Κλείσιμο πακέτου αλλαγών"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr ""
-"Η μεταφορά διακόπηκε λόγω σφάλματος (θα γίνει αναμονή για 5 δευτερόλεπτα):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6163,6 +6194,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "άγνωστο"
@@ -6351,7 +6382,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Δημιουργία περιοχών"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6370,7 +6400,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Δημιουργία περιοχών"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6394,5 +6423,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Περιγραφή"
@@ -7639,7 +7668,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "νερό"
@@ -7942,5 +7971,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -7957,4 +7986,11 @@
 msgstr "Προειδοποίηση"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Προέκυψε σφάλμα: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7984,35 +8020,38 @@
 "δεδομένων από το OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Προσθήκη σχολίου"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Εισάγετε το σχόλιο σας"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Σημείωση ως τελειωμένου"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Επιθυμείτε την σημείωση αυτού του θέματος ως \"τελειωμένο\";"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Επιθυμείτε κλείσιμο;"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Νέο θέμα"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Δημιουργία θέματος"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Περιγράψτε το πρόβλημα επακριβώς"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Δημιουργία θέματος"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8041,5 +8080,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8049,9 +8088,9 @@
 "σελίδα Ρυθμίσεις Χάρτη από τις επιλογές."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "επιλογές osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "εκτελέσιμο Firefox"
@@ -8119,94 +8158,77 @@
 msgstr ""
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Πλοήγηση"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Τίποτα"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "προορισμός"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Κάντε κλικ για να εισάγετε ένα νέο κόμβο."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-#, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Κάντε κλικ για να εισάγετε ένα νέο κόμβο."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Αφαίρεση διπλών κόμβων..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Άνοιγμα λίστας όλων τον σχέσεων."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Σταθμός"
+msgid "Add routing layer"
+msgstr "Προσθήκη νέου επιπέδου"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "μεσαία"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Υποδήματα"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Πιο γρήγορα"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Επαναφορά"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
 msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Προτιμήσεις πρόσθετου WMS"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Ρύθμιση τοποθεσιών πρόσθετων"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Έξοδος Αυτοκινητοδρόμου"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Μεγ. Ταχύτητα (χαω)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Ύψος"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8214,33 +8236,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Φόρτωση πλακιδίου"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Εμφάνιση κατάστασης πλακιδίου"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Αίτηση  Ενημέρωσης"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Φόρτωση όλων των πλακιδίων"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Άυξηση ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Μείωση ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "η εικόνα δεν φορτώθηκε"
@@ -8263,34 +8285,34 @@
 msgstr "Ρυθμίσεις για το πρόσθετο SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Πηγές Πλακιδίων"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Αυτόματο ζουμ: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Αυτόματη φόρτωση Πλακιδίων: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Μέγιστο επίπεδο ζούμ: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "ζητήθηκαν: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "Σφάλμα κατά την αίτηση ενημέρωσης"
@@ -8305,5 +8327,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8358,7 +8380,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Επεξεργασία Πολιτείας"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8373,12 +8394,10 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "καμοία"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "Ύψος"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -8386,17 +8405,17 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένου"
-msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένου"
-msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -8405,25 +8424,21 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Υδατόρρευμα"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Αναζήτηση"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Αρχείο"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Αυτοκίνητο"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8507,5 +8522,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Όνομα οδού"
@@ -8607,17 +8622,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "σχέση"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Αλληλοκαλυπτόμενες περιοχές"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Αλληλοκαλυπτόμενες περιοχές"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8628,12 +8640,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Συγχώνευση διενέξεων."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Διαγραφή από σχέση"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8642,17 +8652,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Κλείσιμο"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Αφαίρεση φωτογραφίας από επίπεδο"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Κόμβος Αυτοκινητοδρόμου"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9237,4 +9244,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9316,7 +9329,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "κτίριο"
@@ -9330,5 +9343,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr ""
@@ -9605,4 +9618,9 @@
 msgstr ""
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9629,7 +9647,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Δημιουργία περιοχών"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9720,21 +9737,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9743,15 +9767,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9761,15 +9785,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9778,5 +9802,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9785,5 +9809,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9792,5 +9816,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9880,5 +9904,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr ""
@@ -9933,7 +9957,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Επίπεδο"
@@ -9976,5 +10000,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Μεγ. Ταχύτητα (χαω)"
@@ -10022,5 +10046,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Μονόδρομος"
@@ -10076,5 +10100,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Γέφυρα"
@@ -10124,5 +10148,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Σήραγγα"
@@ -10169,5 +10193,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr ""
@@ -10214,5 +10238,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr ""
@@ -10370,6 +10394,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Πλάτος (μέτρα)"
@@ -10418,5 +10442,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Επιφάνεια"
@@ -10448,5 +10472,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr ""
@@ -10457,5 +10481,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr ""
@@ -10469,5 +10493,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr ""
@@ -10619,5 +10643,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10638,6 +10662,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "ναι"
@@ -10781,7 +10805,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "όχι"
@@ -10795,73 +10819,63 @@
 msgstr ""
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Άλογο"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Μοτοσυκλέτα"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Αυτοκίνητο"
@@ -10936,130 +10950,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Τύπος"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11067,5 +10969,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11073,11 +10975,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11085,5 +10981,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11091,5 +10987,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11097,5 +10993,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11103,6 +10999,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11121,6 +11023,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "Αυτοκινητόδρομος"
@@ -11146,6 +11048,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr ""
@@ -11171,6 +11073,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "πρωτεύων"
@@ -11196,6 +11098,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "δευτερεύων"
@@ -11209,5 +11111,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr ""
@@ -11225,5 +11127,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "Οικιστική"
@@ -11241,5 +11143,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr ""
@@ -11266,6 +11168,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr ""
@@ -11306,6 +11208,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11316,5 +11217,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "κυκλικός κόμβος"
@@ -11658,14 +11559,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Λειτουργός"
@@ -11690,20 +11591,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "σηματοδότες"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "νησίδα"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11711,5 +11612,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11718,5 +11619,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11726,5 +11627,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11873,10 +11774,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Υψόμετρο"
@@ -11889,29 +11791,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr ""
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11920,7 +11811,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11929,69 +11823,54 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Επιτρεπόμενα οχήματα:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr ""
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
 #: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr ""
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr ""
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
 msgid "Bus Trap"
 msgstr ""
@@ -11999,36 +11878,87 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Σταθμός Διοδίων"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Επεξεργασία Σταθμού Διοδίων"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
 #: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr ""
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr ""
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr ""
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+msgid "Border Control"
+msgstr "Συνοριακός Σταθμός"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Επεξεργασία Συνοριακού Σταθμού"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Φράκτης θάμνων"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Φράκτης"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Τοίχος"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Είσοδος"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Επεξεργασία Εισόδου"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "Πύλη"
@@ -12036,128 +11966,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr "Επεξεργασία Πύλης"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Φράκτης θάμνων"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Φράκτης"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Τοίχος"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Σταθμός Διοδίων"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Επεξεργασία Σταθμού Διοδίων"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Συνοριακός Σταθμός"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Επεξεργασία Συνοριακού Σταθμού"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Είσοδος"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Επεξεργασία Εισόδου"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Νερό"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Πηγή"
@@ -12165,5 +12047,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Επεξεργασία πηγής"
@@ -12171,5 +12053,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr ""
@@ -12177,10 +12059,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Υδατόρρευμα"
@@ -12188,10 +12070,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Επεξεργασία Υδατορρεύματος"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Κανάλι"
@@ -12199,10 +12081,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Επεξεργασία Καναλιού"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Ποταμός"
@@ -12212,5 +12094,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Επεξεργασία ποταμού"
@@ -12218,15 +12100,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Επεξεργασία νερού"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Ξηρά"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Επεξεργασία νερού"
@@ -12234,15 +12116,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Λεκάνη"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Ταμιευτήρας"
@@ -12250,15 +12132,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Επεξεργασία Ταμιευτήρα"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Καλυμένος Ταμιευτήρας"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Επεξεργασία Καλυμένου Ταμιευτήρα"
@@ -12266,5 +12148,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Όχθη ποταμού"
@@ -12273,10 +12155,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Επεξεργασία όχθης ποταμού"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr ""
@@ -12287,56 +12169,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "Βάλτος"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr ""
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "έλος"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Λάσπη"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Παραλία"
@@ -12344,20 +12226,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Επεξεργασία παραλίας"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Όρμος"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Επεξεργασία όρμου"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Λόφος"
@@ -12365,10 +12247,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Επεξεργασία λόφου"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Ακτογραμμή"
@@ -12376,5 +12258,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Επεξεργασία Ακτογραμμής"
@@ -12382,5 +12264,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr ""
@@ -12388,5 +12270,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr ""
@@ -12395,5 +12277,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr ""
@@ -12401,10 +12283,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr ""
@@ -12412,5 +12294,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr ""
@@ -12418,5 +12300,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Φράγμα"
@@ -12424,15 +12306,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Επεξεργασία Φweirράγματος"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr ""
@@ -12441,5 +12323,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Φράγμα εκτροπής"
@@ -12447,20 +12329,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Επεξεργασία φράγματος εκτροπής"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Καταρράκτης"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Επεξεργασία Καταράκτη"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr ""
@@ -12469,15 +12351,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Αποβάθρα"
@@ -12485,10 +12367,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Επεξεργασία Αποβάθρας"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr ""
@@ -12496,10 +12378,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr ""
@@ -12509,5 +12391,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr ""
@@ -12515,10 +12397,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Σιδηρόδρομος"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Σιδηροτροχιά"
@@ -12526,5 +12408,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Επεξεργασία σιδηροτροχιάς"
@@ -12554,8 +12436,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr ""
@@ -12569,81 +12451,81 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr ""
 
+#: build/trans_presets.java:1228
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1229
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#: build/trans_presets.java:1234
+msgid "Monorail"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1236
+msgid "Edit Monorail"
+msgstr ""
+
+#: build/trans_presets.java:1241
+msgid "Preserved"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1242
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1243
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#: build/trans_presets.java:1247
+msgid "Light Rail"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1248
-msgid "Monorail"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1255
-msgid "Preserved"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1256
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1261
-msgid "Light Rail"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1262
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Υπόγειος Σιδηρόδρομος"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Επεξεργασία υπογείου σιδηροδρόμου"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Τραμ"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Επεξεργασία Τραμ"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr ""
@@ -12651,5 +12533,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -12658,14 +12540,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr ""
@@ -12674,5 +12556,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Ισόπεδη διάβαση"
@@ -12681,5 +12563,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Φυλασόμενη Διάβαση"
@@ -12689,5 +12571,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12695,5 +12577,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Περιστρεφόμενη πλατφόρμα"
@@ -12702,57 +12584,70 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
+#: build/trans_presets.java:1314
+msgid "Chair Lift"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
+#: build/trans_presets.java:1316
+msgid "Edit Chair Lift"
+msgstr ""
+
+#. item "Aerialway/Chair Lift" text "Name"
+#: build/trans_presets.java:1320
+msgid "Drag Lift"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
+#: build/trans_presets.java:1322
+msgid "Edit Drag Lift"
+msgstr ""
+
+#. item "Aerialway/Drag Lift" text "Name"
+#: build/trans_presets.java:1326
+msgid "Cable Car"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #: build/trans_presets.java:1328
-msgid "Chair Lift"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
-msgid "Edit Chair Lift"
-msgstr ""
-
-#. item "Aerialway/Chair Lift" text "Name"
+msgid "Edit Cable Car"
+msgstr ""
+
+#. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #: build/trans_presets.java:1334
-msgid "Drag Lift"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
-msgid "Edit Drag Lift"
-msgstr ""
-
-#. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
-msgid "Cable Car"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
-msgid "Edit Cable Car"
-msgstr ""
-
-#. item "Aerialway/Cable Car" text "Name"
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Επεξεργασία Golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Σταθμός"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Επεξεργασία Σταθμού"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Καύσιμα"
@@ -12762,5 +12657,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Επεξεργασία καυσίμων"
@@ -12776,5 +12671,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12784,5 +12679,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Επεξεργασία Χώρου Στάθμευσης"
@@ -12790,40 +12685,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Χωρητικότητα"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "επιφάνεια"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "πολυόροφο"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "υπόγειο"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Θέσεις αναπήρων"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Κόστος"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Πλυντήριο"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Επεξεργασία πλυντηρίου"
@@ -12831,5 +12727,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Κατάστημα"
@@ -12837,15 +12733,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Επεξεργασία Καταστήματος"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Συνεργείο Αυτοκινήτων"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Επεξεργασία Συνεργείου Αυτοκινήτων"
@@ -12853,5 +12749,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Ενοικίαση"
@@ -12860,10 +12756,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Επεξεργασία Ενοικίασης"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Κοινή χρήση"
@@ -12871,5 +12767,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Επεξεργασία κοινής χρήσης αυτοκινήτου"
@@ -12877,5 +12773,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Επεξεργασία χώρου στάθμευσης ποδηλάτων"
@@ -12884,5 +12780,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Επεξεργασία Ενοικίασης ποδηλάτων"
@@ -12891,15 +12787,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Επεξεργασία Καταστήματος Ποδηλάτων"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Μέσα Μαζικής Μεταφοράς"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr ""
@@ -12907,5 +12803,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr ""
@@ -12913,5 +12809,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr ""
@@ -12919,5 +12815,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Στάση Τραμ"
@@ -12926,5 +12822,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Επεξεργασία Στάσης Τραμ"
@@ -12932,5 +12828,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr ""
@@ -12939,5 +12835,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr ""
@@ -12949,5 +12845,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr ""
@@ -12955,10 +12851,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Είσοδος υπογείου σιδηρόδρομου"
@@ -12967,10 +12863,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Επεξεργασία εισόδου υπογείου σιδηρόδρομου"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Αναπηρικό καρότσι"
@@ -12979,5 +12875,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Σταθμός Λεωφορείων"
@@ -12986,5 +12882,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Επεξεργασία Σταθμού Λεωφορείων"
@@ -12992,5 +12888,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Στάση Λεωφορείου"
@@ -13000,5 +12896,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Επεξεργασία Στάσης Λεωφορείου"
@@ -13006,10 +12902,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr ""
@@ -13017,5 +12913,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Ταξί"
@@ -13023,5 +12919,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Επεξεργασία σταθμού ταξί"
@@ -13029,5 +12925,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Αεροδρόμιο"
@@ -13035,15 +12931,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Επεξεργασία Αεροδρομίου"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13052,5 +12948,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Διαμονή"
@@ -13062,5 +12958,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Ξενοδοχείο"
@@ -13069,15 +12965,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Επεξεργασία Ξενοδοχείου"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Αστέρια"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr ""
@@ -13085,20 +12981,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Ξενώνας"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Επεξεργασία Ξενώνα"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Σαλέ"
@@ -13106,41 +13002,41 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Επεξεργασία Σαλέ"
 
 #. item "Accomodation/Chalet" text "Name"
+#: build/trans_presets.java:1554
+msgid "Hostel"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
+#: build/trans_presets.java:1556
+msgid "Edit Hostel"
+msgstr ""
+
+#. item "Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1560
+msgid "Alpine Hut"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1561
-msgid "Hostel"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
-msgid "Edit Hostel"
-msgstr ""
-
-#. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
-msgid "Alpine Hut"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1568
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Χώρος Τροχόσπιτων"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Επεξεργασία Χώρου Τροχόσπιτων"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Χώρος Κάμπινγκ"
@@ -13148,10 +13044,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Επεξεργασία Χώρου Κάμπινγκ"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Φαγητό+Ποτά"
@@ -13162,5 +13058,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Εστιατόριο"
@@ -13168,5 +13064,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Επεξεργασία Εστιατορίου"
@@ -13174,5 +13070,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Κουζίνα"
@@ -13180,61 +13076,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "ιταλική"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "κινέζικη"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "ελληνική"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "γερμανική"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "ινδική"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "τοπική"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "τουρκική"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "ασιατική"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "ταϊλανδέζικη"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "μεξικάνικη"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "ιαπωνική"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -13242,9 +13138,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Επεξεργασία Εστιατορίου Fast Food"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Καφέ"
@@ -13252,10 +13148,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Επεξεργασία Καφέ"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Pub"
@@ -13263,20 +13159,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Επεξεργασία Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "Μπαρ"
@@ -13284,10 +13180,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "Επεξεργασία Μπαρ"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Νυχτερινό Κέντρο"
@@ -13295,20 +13191,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Νυχτερινό Κέντρο"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Τουρισμός"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr ""
@@ -13317,11 +13213,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Ώρες Λειτουργείας"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "Μουσείο"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "Επεξεργασία Μουσείου"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "Ζωολογικός Κήπος"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "Επεξεργασία Ζωολογικού Κήπου"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr ""
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Πύργος Παρατήρησης"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr ""
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "Γραφείο Πληροφοριών"
@@ -13329,143 +13286,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
 msgstr "Επεξεργασία Γραφείου Πληροφοριών"
 
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "Μουσείο"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "Επεξεργασία Μουσείου"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "Ζωολογικός Κήπος"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "Επεξεργασία Ζωολογικού Κήπου"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr ""
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Πύργος Παρατήρησης"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr ""
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr ""
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
-msgstr ""
-
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr "Τύπος Χάρτη"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "χάρτης"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "χάρτης πόλης"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "χάρτης πεζοπορίας"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "χάρτης ποδηλατοδρομίας"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "ιστορία"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr ""
@@ -13473,25 +13370,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Τζάκι"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Ιστορικά Σημεία"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Κάστρο"
@@ -13500,20 +13397,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Επεξεργασία Κάστρου"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ερείπια"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Επεξεργασία Ερειπίων"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Αρχαιολογικός Χώρος"
@@ -13522,20 +13419,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Επεξεργασία Αρχαιολογικού Χώρου"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Πεδίο Μάχης"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Επεξεργασία Πεδίου Μάχης"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Μνημείο"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Επεξεργασία Μνημείου"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Ηρώο"
@@ -13543,56 +13452,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Επεξεργασία Ηρώου"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Πεδίο Μάχης"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Επεξεργασία Πεδίου Μάχης"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Αναψυχή"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Παιδική Χαρά"
@@ -13600,15 +13498,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Επεξεργασία Παιδικής Χαράς"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr ""
@@ -13616,15 +13514,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Χώροι Άθλησης"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Στάδιο"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Επεξεργασία Σταδίου"
@@ -13638,6 +13536,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "επιλέξτε άθλημα:"
@@ -13716,4 +13614,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14005,28 +13911,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "άθληση"
@@ -14036,227 +13943,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "τοξοβολία"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "Καλαθοσφαίρηση"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "Κανόε"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "αναρρήχηση"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "ποδηλασία"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "κυνοδρομίες"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "σκοποβολή"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "κολύμβηση"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "επιτραπέζια αντισφαίρηση"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "αντισφαίρηση"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Αθλητικό Κέντρο"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Επεξεργασία Αθλητικού Κέντρου"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Μίνι Golf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Άθλημα"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Πολλαπλά"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr ""
@@ -14295,191 +14202,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "αθλητικό κέντρο"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "στάδιο"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Τοξοβολία"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Επεξεργασία τοξοβολίας"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Αναρρήχηση"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Επεξεργασία Αναρρήχησης"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Ποδηλασία"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Επεξεργασία Ποδηλασίας"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Κυνοδρομίες"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Επεξεργασία Κυνοδρομιών"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Ιππικό"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Επεξεργασία Ιππικού"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Μηχανοκίνητα Αθλήματα"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Κολύμβηση"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Επεξεργασία Κολύμβησης"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr ""
@@ -14487,56 +14394,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:1920
+msgid "Edit Skiing"
+msgstr ""
+
+#. item "Sport/Skiing" text "Name"
 #: build/trans_presets.java:1923
-msgid "Edit Skiing"
-msgstr ""
-
-#. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Δυσκολία"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "αρχαρίων"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "εύκολη"
 
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
+msgstr "μεσαία"
+
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
+msgstr "προχωρημένη"
+
+#: build/trans_presets.java:1924
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "intermedia"
-msgstr "μεσαία"
-
-#: build/trans_presets.java:1927
-msgid "advance"
-msgstr "προχωρημένη"
-
-#: build/trans_presets.java:1927
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "Σκοποβολή"
@@ -14544,178 +14453,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Επεξεργασία Σκοποβολής"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Ποδόσφαιρο"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Επεξεργασία Ποδοσφαίρου"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Ποδόσφαιρο"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Επεξεργασία Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
+#: build/trans_presets.java:1970
+msgid "golf_course"
+msgstr ""
+
+#: build/trans_presets.java:1972
+msgid "Boule"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1973
-msgid "golf_course"
-msgstr ""
-
-#: build/trans_presets.java:1975
-msgid "Boule"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1976
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Επεξεργασία Rugby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Κτήρια"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Κτήριο"
@@ -14723,5 +14632,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -14729,10 +14638,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Επεξεργασία Δημοσίου Κτηρίου"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Δημαρχείο"
@@ -14740,10 +14649,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Επεξεργασία Δημαρχείου"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -14751,10 +14660,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Επεξεργασία Πρεσβείας"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -14763,10 +14672,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Επεξεργασία Δικαστηρίων"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Φυλακή"
@@ -14775,10 +14684,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Επεξεργασία Φυλακής"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Αστυνομία"
@@ -14788,10 +14697,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Επεξεργασία Αστυνομίας"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -14800,10 +14709,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Επεξεργασία Πυροσβεστείου"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -14811,5 +14720,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Επεξεργασία Ταχυδρομείου"
@@ -14817,15 +14726,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Νηπιαγωγίο"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγίου"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Σχολείο"
@@ -14833,10 +14742,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Επεξεργασία Σχολείου"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -14844,10 +14753,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Επεξεργασία Πανεπιστημίου"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Κολέγιο"
@@ -14855,5 +14764,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Επεξεργασία Κολεγίου"
@@ -14861,5 +14770,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -14868,10 +14777,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Επεξεργασία Κινηματογράφου"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -14880,10 +14789,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Επεξεργασία Βιβλιοθήκης"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -14891,10 +14800,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Επεξεργασία Κέντρου Τεχνών"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Θέατρο"
@@ -14903,10 +14812,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Επεξεργασία Θεάτρου"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -14916,5 +14825,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Επεξεργασία Τόπου Λατρείας"
@@ -14923,6 +14832,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Θρησκεία"
@@ -14931,66 +14840,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "βουδισμός"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "χριστιανισμός"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "ινδουϊσμός"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "ιουδαϊσμός"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "μουσουλμανισμός"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "ταοϊσμός"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
+msgstr "ιταλική"
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -14999,81 +14909,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "αγγλικανικό"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "βαπτιστικό"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "καθολικό"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "ευαγγελικό"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "μαρτύρων του Ιεχοβά"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "λουθερανικό"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "ορθόδοξο"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "πεντηκωστής"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "προτεσταντικό"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Διευθύνσεις"
@@ -15082,5 +14992,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -15088,5 +14998,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
@@ -15094,20 +15004,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Όνομα Σπιτιού"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Όνομα πόλης"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Ταχυδρομικός Κώδικας"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Κωδικός χώρας"
@@ -15115,5 +15025,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -15122,5 +15032,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
@@ -15128,67 +15038,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Τρόπος Αρίθμησης"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "Μονά"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "Ζυγά"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "όλα"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -15196,10 +15110,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -15207,10 +15121,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -15218,10 +15132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Επεξεργασία Αγωγού"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -15231,10 +15145,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Επεξεργασία Βιολογικού Καθαρισμού"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Γερανός"
@@ -15242,10 +15156,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Επεξεργασία Γερανού"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Φάρος"
@@ -15253,10 +15167,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr ""
@@ -15264,10 +15178,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -15275,5 +15189,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
@@ -15281,5 +15195,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -15289,39 +15203,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "Φωτοβολταϊκό"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "Αέριο"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -15330,10 +15244,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -15342,5 +15256,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -15348,10 +15262,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Πυλώνασ Ρεύματος"
@@ -15362,5 +15276,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Επεξεργασία Πυλώνα Ρεύματος"
@@ -15368,5 +15282,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
@@ -15375,25 +15289,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Τάση ρεύματος"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Ποσότητα Αγωγών"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Τουαλέτες"
@@ -15401,25 +15315,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Αριθμός Αναφοράς"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Χρέωση"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Σημείωση"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Γραμματοκιβώτιο"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Τηλέφωνο"
@@ -15428,5 +15337,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Επεξεργασία Τηλεφώνου"
@@ -15434,5 +15343,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Κέρματα"
@@ -15440,5 +15349,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Χαρτονομίσματα"
@@ -15446,5 +15355,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -15452,5 +15361,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Χρεωστικές Κάρτεσ"
@@ -15458,15 +15367,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -15475,5 +15384,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -15481,35 +15390,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Μπαταρίες"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Τενεκεδάκια"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Ρούχα"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Παγκάκι"
@@ -15518,20 +15427,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:2342
+msgid "Edit Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand" check "Shelter"
 #: build/trans_presets.java:2345
-msgid "Edit Hunting Stand"
-msgstr ""
-
-#. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
 msgid "Hide"
 msgstr "Κρυψώνα"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Κλειδαριά"
@@ -15539,22 +15448,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -15563,10 +15472,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -15575,10 +15484,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
@@ -15586,25 +15495,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Επεξεργασία Βρεφοδόχου"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Καταστήματα"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Επεξεργασία Supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr ""
@@ -15612,10 +15521,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Περίπτερο"
@@ -15623,10 +15532,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Επεξεργασία Περιπτέρου"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Μηχάνημα Πώλησης"
@@ -15634,5 +15543,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Επεξεργασία Μηχανήματος Πώλησης"
@@ -15640,88 +15549,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Πωλούμενα Προϊόντα"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "εισιτήρια Στάθμευσης"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "φαγητό"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "ποτά"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "γλυκά"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "τσιγάρα"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "φωτογραφίες"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "τροφές ζώων"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "εφημερίδες"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "Παιχνίδια"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "Γραμματόσημα"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "Κάρτες SIM"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "κουπόνια"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "Προφυλακτικά"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Κρεοπωλείο"
@@ -15729,10 +15638,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Επεξεργασία Κρεοπωλείου"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Φούρνος"
@@ -15740,10 +15649,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Επεξεργασία Φούρνου"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Ανθοπωλείο"
@@ -15751,70 +15660,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Επεξεργασία Ανθοπωλείου"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "Βιολογικά"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Επεξεργασία Καταστήματος Βιολογικών"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Σχολείο"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Επεξεργασία Υποδηματοπωλείου"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
-msgstr ""
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
+msgstr "Επεξεργασία Καταστήματος"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Υπολογιστές"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Ηλεκτρονικά"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Ηχοσυστήματα"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Έπιπλα"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Επεξεργασία Καταστήματος Επίπλων"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Είδη Κήπου"
@@ -15822,10 +15745,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "Σιδηρικά"
@@ -15833,10 +15756,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -15844,60 +15767,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Χαρτικά"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Επεξεργασία Χαρτοπωλείου"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Κομμωτήριο"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Επεξεργασία Κομμωτηρίου"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Υποδήματα"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Επεξεργασία Υποδηματοπωλείου"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Παιχνίδια"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Στπγνοκαθαριστήριο"
@@ -15905,10 +15828,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Πλυντήριο"
@@ -15916,10 +15839,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Επεξεργασία πλυντηρίου"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr ""
@@ -15927,35 +15850,36 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Άθλημα"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Επεξεργασία Καταστήματος Αθλητικών"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2522
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+msgid "Optician"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr ""
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Μετρητά"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -15963,5 +15887,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Επεξεργασία Τράπεζας"
@@ -15969,10 +15893,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "ΑΤΜ"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Συναλλακτήριο"
@@ -15980,5 +15904,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Επεξεργασία Συναλλακτηρίου"
@@ -15986,15 +15910,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Επεξεργασία ΑΤΜ"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Υγεία"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Ιατροί"
@@ -16002,20 +15926,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Επεξεργασία Ιατρών"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Οδοντίατρος"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Επεξεργασία Οδοντιάτρου"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Φαρμακείο"
@@ -16023,5 +15947,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Επεξεργασία Φαρμακείου"
@@ -16029,10 +15953,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Νοσοκομείο"
@@ -16040,10 +15964,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Επεξεργασία Νοσοκομειου"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr ""
@@ -16052,5 +15976,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -16059,20 +15983,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Αριθμός Τηλεφώνου"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -16080,5 +16004,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Κτηνιατρίο"
@@ -16087,25 +16011,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Επεξεργασία Κτηνιατρίου"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Ήπειρος"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Χώρα"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
@@ -16113,45 +16037,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Πολιτεία"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Περιοχή"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Περιφέρεια"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Πόλη"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Κωμόπολη"
@@ -16159,10 +16084,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Επεξεργασία Κωμόπολης"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Προάστιο"
@@ -16170,30 +16095,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Επεξεργασία Προαστίου"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Χωριό"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr ""
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr ""
@@ -16201,10 +16127,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Νησί"
@@ -16212,5 +16138,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Επεξεργασία Νησιού"
@@ -16218,5 +16144,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Είσοδος σπηλαίου"
@@ -16224,10 +16150,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Επεξεργασία εισόδου σπηλαίου"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Κορυφή"
@@ -16235,10 +16161,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Επεξεργασία κορυφής"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Παγετώνας"
@@ -16246,10 +16172,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Επεξεργασία παγετώνα"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Ηφαίστειο"
@@ -16257,70 +16183,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Επεξεργασία ηφαιστείου"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Όρια"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Εθνικό"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Επεξεργασία Εθνικού Συνόρου"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Διοικητικό"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Επεξεργασία Διοικητικού Ορίου"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Πολιτικό"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Δένδρο"
@@ -16329,15 +16255,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Επεξεργασία δένδρου"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Βοτανικό όνομα"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Άλσος"
@@ -16346,5 +16272,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Επεξεργασία άλσους"
@@ -16352,17 +16278,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "Κωνοφόρο"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "φυλλοβόλα"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "Μικτό"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Δάσος"
@@ -16371,19 +16297,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Επεξεργασία Δάσους"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr ""
@@ -16392,70 +16362,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr ""
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16463,10 +16434,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr ""
@@ -16474,20 +16445,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -16495,5 +16466,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Επεξεργασία χώρου αναψυχής"
@@ -16501,15 +16472,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -16517,9 +16488,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -16527,39 +16498,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Επεξεργασία χρήσης γης κοιμητηρίου"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr ""
@@ -16567,114 +16538,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Στρατιωτικά"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr ""
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
-msgid "Brownfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2886
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
-msgid "Greenfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2892
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2921
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2922
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2927
+msgid "Brownfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2928
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:2933
+msgid "Greenfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2934
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Στρατιωτικά"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr ""
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr ""
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr ""
@@ -16684,5 +16612,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr ""
@@ -16691,10 +16619,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr ""
@@ -16702,5 +16630,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -16709,5 +16637,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Επεξεργασία περιορισμού στροφής"
@@ -16715,34 +16643,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -16751,15 +16679,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr ""
@@ -16767,5 +16695,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Διαδρομή"
@@ -16774,5 +16702,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "Επεξεργασία Διαδρομής"
@@ -16780,5 +16708,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Τύπος Διαδρομής"
@@ -16850,24 +16778,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "ποδήλατο"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "σκι"
@@ -16912,4 +16840,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16919,19 +16850,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "πεζοπορία"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "παράκαμψη"
@@ -16945,10 +16877,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -16956,26 +16888,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -16984,30 +16916,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17191,4 +17123,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17200,4 +17239,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17299,11 +17347,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr ""
@@ -17345,7 +17395,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "άλογο"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Εμπόδια"
 
 #. color tertiary
@@ -17381,6 +17646,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "οδός"
@@ -17436,7 +17701,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr ""
@@ -17483,108 +17748,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr ""
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr ""
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17601,4 +17779,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "Υπηρεσίες"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17608,4 +17792,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "φαγητό"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17622,6 +17812,19 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
 msgstr ""
 
@@ -17635,5 +17838,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "όχθη ποταμού"
@@ -17647,5 +17850,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "υδατόρρευμα"
@@ -17659,5 +17862,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "προβλήτα"
@@ -17685,5 +17888,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "υδαταγωγός"
@@ -17698,4 +17901,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17735,5 +17939,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17850,12 +18054,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr ""
@@ -17901,5 +18106,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17917,7 +18122,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17940,10 +18145,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17973,6 +18178,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -18017,6 +18222,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -18030,5 +18235,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr ""
@@ -18050,5 +18255,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -18062,5 +18267,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -18083,4 +18288,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18100,4 +18313,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr ""
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18106,23 +18325,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr ""
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "πίστα εύκολη"
@@ -18136,5 +18342,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "πίστα μεσαία"
@@ -18148,5 +18355,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "πίστα προχορημένη"
@@ -18159,6 +18367,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "πίστα εύκολη"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18172,5 +18395,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "πιστα αρχαρίων"
@@ -18201,4 +18425,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18233,4 +18465,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18243,8 +18499,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr ""
@@ -18257,5 +18515,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "προβλήτα"
@@ -18269,5 +18530,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "αγωγός"
@@ -18395,12 +18656,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "αναψυχή"
@@ -18414,5 +18675,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr ""
@@ -18484,8 +18745,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18521,4 +18782,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18578,11 +18847,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18721,6 +18990,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18947,22 +19237,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -18994,6 +19284,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -19029,4 +19319,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19046,7 +19344,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "υγεία"
@@ -19140,4 +19439,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19340,4 +19647,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19371,28 +19694,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "κατάστημα"
@@ -19446,4 +19771,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19456,8 +19789,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "ξενοδοχείο"
@@ -19512,4 +19845,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19606,9 +19940,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "τουρισμός"
@@ -19680,8 +20014,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "ιστορικό"
@@ -19751,9 +20085,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr ""
@@ -19767,5 +20101,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "λατομείο"
@@ -19779,5 +20113,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "Χ.Υ.Τ.Α."
@@ -19799,5 +20133,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "λεκάνη"
@@ -19811,5 +20145,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "δάσος"
@@ -19823,5 +20157,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -19844,5 +20178,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr ""
@@ -19856,5 +20190,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "βιομηχανική"
@@ -19868,5 +20202,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19880,5 +20214,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -19892,5 +20226,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -19947,7 +20281,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "στρατιωτική"
@@ -19961,5 +20295,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "κοιμητήριο"
@@ -19972,5 +20306,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "κορυφή"
@@ -19985,5 +20319,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "παγετώνας"
@@ -19997,5 +20331,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "ηφαίστειο"
@@ -20010,4 +20344,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20049,7 +20384,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr ""
@@ -20063,5 +20399,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr ""
@@ -20075,5 +20411,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr ""
@@ -20087,5 +20423,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "άλσος"
@@ -20099,5 +20435,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "λάσπη"
@@ -20111,5 +20447,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "παραλία"
@@ -20187,8 +20523,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr ""
@@ -20236,7 +20572,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "όριο"
@@ -20378,10 +20714,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr ""
@@ -20422,6 +20758,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "διεύθυνση"
@@ -20703,207 +21046,28 @@
 msgstr "Streets NRW Geofabrik.de"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Άνοιγμα..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Περιγραφή"
+
+#~ msgid "Commit comment"
+#~ msgstr "Οριστικοποίηση σχολίου"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Ο διακομιστής δεν υποστηρίζει πακέτα αλλαγών"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
 #~ msgstr ""
-#~ "Αν η συσκευή GPS σας σχεδιάζει πολύ λίγες γραμμές, επιλέξτε αυτό για να "
-#~ "σχεδιαστούν γραμμές στο δρόμο σας."
-
-#~ msgid "Navigate"
+#~ "Η μεταφορά διακόπηκε λόγω σφάλματος (θα γίνει αναμονή για 5 δευτερόλεπτα):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Επιθυμείτε την σημείωση αυτού του θέματος ως \"τελειωμένο\";"
+
+#~ msgid "Navigation"
 #~ msgstr "Πλοήγηση"
 
-#~ msgid "Please select a color."
-#~ msgstr "Παρακαλώ επιλέξτε ένα χρώμα."
-
-#~ msgid "News about JOSM"
-#~ msgstr "Νέα του JOSM"
-
-#~ msgid "OSM History Information"
-#~ msgstr "Πληροφορίες Ιστορικού OSM"
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Κάντε κλικ για να δημιουργήσετε μια σύνδεση στον υπάρχοντα κόμβο."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Κάντε κλικ για να εισάγετε ένα νέο κόμβο και να κάνετε μια σύνδεση."
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr ""
-#~ "Παρακαλώ διαλέξτε αντικείμενα για τα οποία θέλετε να αλλάξετε τις "
-#~ "ιδιότητες."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "Αυτός είναι ο βασικός επεξεργαστής σχέσεων που σας επιτρέπει να αλλάξετε "
-#~ "τις ετικέτες σχέσεων καθώς επίσης και τα μέλη τους. Επιπρόσθετα θα πρέπει "
-#~ "να έχουμε έναν έξυπνο επεξεργαστή που ανιχνεύει τον τύπο της σχέσης κα "
-#~ "ιπεριορίζει τις επιλογές με κάποιο λογικό τρόπο."
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Αποστολή αυτού του ίχνους..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Αυτή η δυνατότητα προστέθηκε πρόσφατα.Παρακαλώ<br>χρησιμοποιήστε "
-#~ "την με προσοχή και ελέγξτε ότι δουλεύει όπως πρέπει.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Αποστολή ίχνους φιλτραρισμένου από το JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Αποστολή ακατέργαστου αρχείου: "
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Ετικέτες (λέξεις κλειδιά σε GPX):"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "Αποστολή GPX"
-
-#~ msgid "time"
-#~ msgstr "ώρα"
-
-#~ msgid "desc"
-#~ msgstr "περιγραφή"
-
-#~ msgid "symbol"
-#~ msgstr "σύμβολο"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Αποστολή ακατέργαστου αρχείου: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Ετικέτες:"
-
-#~ msgid "Unknown type"
-#~ msgstr "Άγνωστος τύπος"
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Αποστολή {0} {1} (id: {2}) {3}% {4}/{5} (απομένουν {6} )..."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Επεξεργασία Εξόδου"
-
-#~ msgid "Exit Number"
-#~ msgstr "Αριθμός Εξόδου"
-
-#~ msgid "Information point"
-#~ msgstr "Σημείο Πληροφόρησης"
-
-#~ msgid "Provider"
-#~ msgstr "Πάροχος"
-
-#~ msgid "political"
-#~ msgstr "Πολιτικό"
-
-#~ msgid "National_park"
-#~ msgstr "Εθνικός Δρυμός"
-
-#~ msgid "Add Site"
-#~ msgstr "Προσθήκη τοποθεσίας"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Διαγραφή τοποθεσίας"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Παρακαλώ επιλέξτε την τοποθεσία προς διαγραφή."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Έλεγχος τοποθεσίας"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Παρακαλώ επιλέξτε την τοποθεσία προς έλεγχο ενημερώσεων."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Προσθήκη νέας τοποθεσίας πρόσθετων."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Διαγραφή της επιλεγμένης τοποθεσίας από την λίστα."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr ""
-#~ "Έλεγχος της επιλεγμένης τοποθεσίας για νέα πρόσθετα και ενημερώσεις."
-
-#~ msgid "Update Sites"
-#~ msgstr "Ενημέρωση τοποθεσιών"
-
-#~ msgid "Version"
-#~ msgstr "Έκδοση"
-
-#~ msgid "Install"
-#~ msgstr "Εγκατάσταση"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Έκδοση: {0}<br>Τελευταία αλλαγή στις {1}"
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr ""
-#~ "Το LiveGpsPlugin δεν βρέθηκε, παρακαλώ εγκαταστήστε και ενεργοποιήστε το."
-
-#~ msgid "SurveyorPlugin"
-#~ msgstr "SurveyorPlugin"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Έκδοση {0} - Τελευταία αλλαγή στις {1}"
-
-#~ msgid "Open waypoints file"
-#~ msgstr "Άνοιγμα αρχείου σημείων αναφοράς"
-
-#~ msgid "Open a waypoints file."
-#~ msgstr "Άνοιγμα ενός αρχείου σημείων αναφοράς."
-
-#~ msgid ""
-#~ "<html>Fulltext search:<ul><li><b>Baker Street</b> - 'Baker' and 'Street' "
-#~ "in any key or name.</li><li><b>\"Baker Street\"</b> - 'Baker Street' in "
-#~ "any key or name.</li><li><b>name:Bak</b> - 'Bak' anywhere in the name.</"
-#~ "li><li><b>-name:Bak</b> - not 'Bak' in the name.</li><li><b>foot:</b> - "
-#~ "key=foot set to any value.</li><li>Special targets:</li><li><b>type:</b> "
-#~ "- type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)</"
-#~ "li><li><b>user:</b>... - all objects changed by user</li><li><b>id:</"
-#~ "b>... - object with given ID</li><li><b>nodes:</b>... - object with given "
-#~ "number of nodes</li><li><b>modified</b> - all changed objects</"
-#~ "li><li><b>selected</b> - all selected objects</li><li><b>incomplete</b> - "
-#~ "all incomplete objects</li><li>Use <b>|</b> or <b>OR</b> to combine with "
-#~ "logical or</li><li>Use <b>\"</b> to quote operators (e.g. if key "
-#~ "contains :)</li><li>Use <b>(</b> and <b>)</b> to group expressions</li></"
-#~ "ul></html>"
-#~ msgstr ""
-#~ "<html>Fulltext search:<ul><li><b>Baker Street</b> - 'Baker' και 'Street' "
-#~ "σε οποιοδήποτε κλειδί ή όνομα.</li><li><b>\"Baker Street\"</b> - 'Baker "
-#~ "Street' σε οποιοδήποτε κλειδί ή όνομα.</li><li><b>name:Bak</b> - 'Bak' "
-#~ "οπυδήποτε στο όνομα.</li><li><b>-name:Bak</b> - χωρίς 'Bak' στο όνομα.</"
-#~ "li><li><b>foot:</b> - κλειδί=foot ρυθμισμένο σε οποιαδήποτε τιμή.</"
-#~ "li><li>Special targets:</li><li><b>type:</b> - τύπος του αντικειμένου "
-#~ "(<b>κόμβος</b>, <b>way</b>, <b>σχέση</b>)</li><li><b>user:</b>... - όλα "
-#~ "τα αντικείμενα που αλλάχτηκαν απο τον  user</li><li><b>id:</b>... - "
-#~ "αντικείμενα με το δωσμένο ID</li><li><b>nodes:</b>... - αντικείμενο με "
-#~ "τον δοσμένο αριθμό κόμβων</li><li><b>modified</b> - όλα τα αλλαγμένα "
-#~ "αντικείμενα</li><li><b>selected</b> - όλα τα επιλεγμένα αντικείμενα</"
-#~ "li><li><b>incomplete</b> - all incomplete objects</li><li>Χρησιμοποιήστε "
-#~ "το <b>|</b> ή το <b>OR</b> για να συνδιάσετε με λογικό or</li><li>Use <b>"
-#~ "\"</b> to quote operators (e.g. if key contains :)</"
-#~ "li><li>Χρησιμοποιήστε  <b>(</b> και <b>)</b> για να ομαδοποιήσετε όρους</"
-#~ "li></ul></html>"
-
-#~ msgid "Add Node"
-#~ msgstr "Προσθήκη Κόμβου"
-
-#~ msgid "Signpost"
-#~ msgstr "Κολώνα πινακίδων"
-
-#~ msgid "office"
-#~ msgstr "γραφείο"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Ενημέρωση URL τοποθεσίας"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Μη έγκυρο URL"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Λήψη \"Μηνύματος ημέρας\""
+#~ msgid "Charge"
+#~ msgstr "Χρέωση"
Index: /applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- /applications/editors/josm/i18n/po/en_GB.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/en_GB.po	(revision 14844)
@@ -1,25 +1,26 @@
 # English (British) translation of JOSM.
 # Copyright (C) 2006 Immanuel Scholz
-# This file is distributed under the same license as the JOSM package.
+# This file is distributed under the same licence as the JOSM package.
 #
-# Bruce Cowan <bruce.cowan@dsl.pipex.com>, 2006.
+# Bruce Cowan <bcowan@fastmail.co.uk>, 2006 - 2009.
 # Dirk Stöcker <openstreetmap@dstoecker.de>, 2008.
+# Bruce Cowan <bcowan@fastmail.co.uk>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: en_GB\n"
+"Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-24 19:39+0000\n"
-"Last-Translator: nin2jardin <Unknown>\n"
-"Language-Team: JOSM\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-27 20:36+0000\n"
+"Last-Translator: Bruce Cowan <lp@bcowan.fastmail.co.uk>\n"
+"Language-Team: British English <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:52+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
@@ -37,38 +38,38 @@
 msgstr "The projection could not be read from preferences. Using EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Hint: Some changes came from uploading new data to the server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Unsaved Changes"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "There are unsaved changes. Discard the changes and continue?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Save and Exit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Discard and Exit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -79,10 +80,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -93,4 +94,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -100,10 +102,10 @@
 msgstr "Cancel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoring malformed URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -129,8 +131,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -271,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -407,6 +409,6 @@
 msgstr "Reverse and Combine"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -414,20 +416,20 @@
 msgstr "Enter values for all conflicts."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Solve Conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combine {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "All the ways were empty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -529,5 +531,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -648,6 +650,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -656,6 +658,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -710,5 +712,5 @@
 #, java-format
 msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
@@ -718,5 +720,5 @@
 "\">your language</A>."
 msgstr ""
-"Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF=\"{1}"
+"Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}"
 "\">your language</A>."
 
@@ -784,9 +786,9 @@
 msgstr "Merge Anyway"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 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:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -939,5 +941,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 msgid "Orthogonalize Shape"
-msgstr "Orthogonalize Shape"
+msgstr "Orthogonalise Shape"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41
@@ -1061,5 +1063,5 @@
 msgstr "Save the current data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1069,26 +1071,26 @@
 "a bug."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "No document open so nothing to save."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Empty document"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "The document contains no data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Save anyway"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1098,32 +1100,32 @@
 "if you rejected all. Continue?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Reject Conflicts and Save"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Save GPX file"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Save OSM file"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Could not back up file."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Unknown file extension."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "An error occurred while saving."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "An error occurred while restoring backup file."
@@ -1180,18 +1182,18 @@
 msgstr "Close"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Split Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Split a way at the selected node."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "The current selection cannot be used for splitting."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1199,5 +1201,5 @@
 msgstr[1] "The selected nodes are not in the middle of any way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1213,9 +1215,9 @@
 "way also."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "The selected nodes do not share the same way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1223,10 +1225,10 @@
 msgstr[1] "The selected way does not contain all the selected nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "You must select two or more nodes to split a circular way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1236,5 +1238,5 @@
 "middle of the way.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1244,5 +1246,5 @@
 "You should verify this and correct it when necessary."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1397,46 +1399,50 @@
 "continue?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Upload to OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Upload all changes to the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Objects to add:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Objects to modify:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Objects to delete:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Provide a brief comment for the changes you are uploading:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Upload these changes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Upload Changes"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Nothing to upload. Get some data first."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "There are unresolved conflicts. You have to resolve these first."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "No changes to upload."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Uploading data"
@@ -1566,5 +1572,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
 msgid "The following errors occured during mass download:"
-msgstr "The following errors occured during mass download:"
+msgstr "The following errors occurred during mass download:"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:89
@@ -1621,31 +1627,33 @@
 msgstr "Cannot add a node outside of the world."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Add node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Add node into way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Connect existing way to node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Add a new node to an existing way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Add node into way and connect"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Create new node."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Select node under cursor."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1654,9 +1662,4 @@
 msgstr[0] "Insert new node into {0} way."
 msgstr[1] "Insert new node into {0} ways."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Select node under cursor."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2076,5 +2079,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2269,5 +2272,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "railway"
@@ -2289,127 +2292,127 @@
 msgstr[1] "{0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Area style way is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipolygon way ''{0}'' is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Empty member in relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Deleted member ''{0}'' in relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Way ''{0}'' with less than two points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "More than one \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "More than one \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "More than one \"via\" found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unknown role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unknown member type for ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "No \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "No \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "No \"via\" node or way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "The \"from\" way doesn't start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "The \"to\" way doesn't start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "The \"from\" way doesn't start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "The \"to\" way doesn't start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Style for restriction {0} not found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "No useful role ''{0}'' for Way ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-Way ''{0}'' in multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "No outer way for multipolygon ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersection between ways ''{0}'' and ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Inner way ''{0}'' is outside."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Style for inner way ''{0}'' equals multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Style for outer way ''{0}'' mismatches."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "untagged"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "text"
@@ -2417,5 +2420,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2443,5 +2446,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "background"
@@ -2509,5 +2512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2521,5 +2524,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2549,14 +2552,14 @@
 msgstr "resolved version:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Message of the day not available"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "- running version is {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Downloading \"Message of the day\""
@@ -2628,71 +2631,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Username"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Open file (as raw gps, if .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
-msgstr "Launch in maximized mode"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+msgstr "Launch in maximised mode"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Set the language."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2702,23 +2705,28 @@
 "some data before --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Activating updated plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Loading early plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Loading plugins"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2897,5 +2905,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -2922,5 +2930,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
 msgid "Open a merge dialog of all selected items in the list above."
-msgstr "Open a merge dialog of all selected items in the list above."
+msgstr "Open a merge dialogue of all selected items in the list above."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71
@@ -3107,5 +3115,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Role"
@@ -3153,73 +3161,71 @@
 msgstr "Properties / Memberships"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Apply Changes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Create new relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Edit new relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Edit relation #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Basic"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Occupied By"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (empty value deletes tag)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Move Up"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Move the currently selected members up"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Add Selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Add all currently selected objects as members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Remove Selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Remove all currently selected objects from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Move Down"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Move the currently selected members down"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3228,36 +3234,36 @@
 msgstr "Remove"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Remove the member in the current table row from this relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Download all incomplete ways and nodes in relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Members: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relation Editor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "There were conflicts during import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Error parsing server response."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Cannot connect to server."
@@ -3271,10 +3277,11 @@
 msgstr "Delete the selected relation"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relations"
@@ -3354,5 +3361,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:220
 msgid "Click to minimize/maximize the panel content"
-msgstr "Click to minimize/maximize the panel content"
+msgstr "Click to minimise/maximise the panel content"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53
@@ -3466,5 +3473,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Places"
@@ -3511,21 +3518,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "type"
@@ -3578,10 +3585,7 @@
 msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Map"
@@ -3735,4 +3739,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3838,5 +3843,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3859,5 +3864,5 @@
 #, java-format
 msgid "{0} meters"
-msgstr "{0} meters"
+msgstr "{0} metres"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704
@@ -3899,19 +3904,34 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consists of:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} deleted.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "usage"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3919,21 +3939,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4037,5 +4057,5 @@
 msgstr ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
+"point where you want to synchronise."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
@@ -4374,5 +4394,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4457,4 +4477,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4538,7 +4560,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4551,7 +4570,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4567,10 +4593,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4739,5 +4765,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4771,7 +4799,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4855,4 +4883,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4905,4 +4941,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4911,7 +4953,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4920,15 +4959,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4953,129 +4981,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Name"
@@ -5124,12 +5154,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Load All Tiles"
+msgstr "Local files"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zone"
+msgstr "None"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5151,50 +5179,40 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
 msgid "Single Color (can be customized for named layers)"
-msgstr "Single Colour (can be customized for named layers)"
+msgstr "Single Colour (can be customised for named layers)"
 
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Car"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Bicycle"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5202,25 +5220,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Foot"
@@ -5268,7 +5291,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Draw lines between raw gps points."
+msgstr "Draw lines between raw GPS points"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5321,5 +5343,5 @@
 "Layer Manager."
 msgstr ""
-"All points and track segments will have the same colour. Can be customized "
+"All points and track segments will have the same colour. Can be customised "
 "in Layer Manager."
 
@@ -5546,5 +5568,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
 msgid "Login name (email) to the OSM account."
-msgstr "Login name (email) to the OSM account."
+msgstr "Login name (e-mail) to the OSM account."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
@@ -5573,5 +5595,5 @@
 msgstr ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transfered in plain text to the server, encoded in the "
+"<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>"
 
@@ -5908,10 +5930,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, possibly some missing tags."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Preparing data..."
@@ -5921,25 +5943,75 @@
 msgstr "Parse error: invalid document structure for gpx document"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Opening changeset..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Closing changeset..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "No changes to upload."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Preparing..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Uploading..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Error parsing server response."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Unknown host"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Incorrect password or username."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Warning: The password is transferred unencrypted."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Save user and password (unencrypted)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5950,44 +6022,52 @@
 msgstr "Error during parse."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Unknown version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Unknown version"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Found <nd> element in non-way."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> has zero ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Found <member> element in non-relation."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member> specification with ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Illegal object with id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Missing required attribute \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Prepare OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Ill-formed node id"
@@ -5997,5 +6077,5 @@
 msgstr "Contacting Server..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -6003,5 +6083,5 @@
 "Couldn't connect to the osm server. Please check your internet connection."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6011,55 +6091,8 @@
 "some time."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Provide a brief comment for the changes you are uploading:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Commit comment"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "An error occurred: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Opening changeset..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Server does not support changesets"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Unknown host"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Preparing..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Uploading..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Closing changeset..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Transfer aborted due to error (will wait for 5 seconds):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6230,6 +6263,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "unknown"
@@ -6415,7 +6448,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Create areas"
+msgstr "Create grid of ways"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6424,17 +6456,18 @@
 "in common"
 msgstr ""
+"Forms a grid of ways in base to two existing that have various nodes and one "
+"in common"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Select two ways with a node in common"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Select two ways with alone a node in common"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Create areas"
+msgstr "Create a grid of ways"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6458,5 +6491,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Description"
@@ -6841,5 +6874,5 @@
 "adjust the sliders to manually match the photos."
 msgstr ""
-"An error occured while trying to match the photos to the GPX track. You can "
+"An error occurred while trying to match the photos to the GPX track. You can "
 "adjust the sliders to manually match the photos."
 
@@ -6947,9 +6980,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
 msgid "Replace original background by JOSM background color."
-msgstr "Replace original background by JOSM background color."
+msgstr "Replace original background by JOSM background colour."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
 msgid "Reverse grey colors (for black backgrounds)."
-msgstr "Reverse grey colors (for black backgrounds)."
+msgstr "Reverse grey colours (for black backgrounds)."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
@@ -7042,5 +7075,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
 msgid "Fixed size (from 25 to 1000 meters)"
-msgstr "Fixed size (from 25 to 1000 meters)"
+msgstr "Fixed size (from 25 to 1000 metres)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
@@ -7105,5 +7138,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
 msgid "Only on vectorized layers"
-msgstr "Only on vectorized layers"
+msgstr "Only on vectorised layers"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
@@ -7221,14 +7254,14 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 msgid "Is not vectorized."
-msgstr "Is not vectorized."
+msgstr "Is not vectorised."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185
 #, java-format
 msgid "Raster center: {0}"
-msgstr "Raster center: {0}"
+msgstr "Raster centre: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is vectorized."
-msgstr "Is vectorized."
+msgstr "Is vectorised."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188
@@ -7732,7 +7765,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "water"
@@ -8032,5 +8065,5 @@
 msgstr "OpenStreetBugs download loop"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Displays OpenStreetBugs issues"
@@ -8049,4 +8082,11 @@
 msgstr "Warning"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "An error occurred: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8074,35 +8114,38 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Add a comment"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Enter your comment"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Mark as done"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Really mark this issue as ''done''?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Really close?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "New issue"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Create issue"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Describe the problem precisely"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Create issue"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8131,5 +8174,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8139,9 +8182,9 @@
 "the preferences."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "osmarender options"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Firefox executable"
@@ -8212,129 +8255,113 @@
 msgstr "Remote Control has been asked to import data from the following URL:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Navigation"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr "Routing"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Nothing"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "Click to add route nodes."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Click to insert a new node."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "Click and drag to move route nodes."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Click to insert a new node."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "Click to add route nodes."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "Open a list of routing nodes"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "Removing duplicate nodes..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Open a list of all relations."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Station"
+msgid "Add routing layer"
+msgstr "Add new layer"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "intermediate"
+msgstr "Criteria"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Shoes"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "Shortest"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Faster"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "Fastest"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Reverse Terrace"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr "Reverse route"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Ferry Route"
+msgstr "Clear route"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "WMS Plugin Preferences"
+msgstr "Routing Plugin Preferences"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Configure Plugin Sites"
+msgstr "Configure routing preferences."
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Highway Exit"
+msgstr "Highway type"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Max. speed (km/h)"
+msgstr "Speed (Km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Height"
+msgstr "Weight"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "Enter weight values"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Load Tile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Show Tile Status"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Request Update"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Load All Tiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Increase zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Decrease zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "image not loaded"
@@ -8357,34 +8384,34 @@
 msgstr "Settings for the SlippyMap plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Tile Sources"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Auto zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Autoload Tiles: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Max zoom lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Fade background: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "error loading metadata"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "requested: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "error requesting update"
@@ -8399,5 +8426,5 @@
 msgstr "Save captured data to file every minute."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8452,7 +8479,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Edit State"
+msgstr "Edit tags"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8460,66 +8486,58 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Launches the tag editor dialogue"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "JOSM Tag Editor Plugin"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "none"
+msgstr "(none)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "highlight"
+msgstr "Highlight"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "multi"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr "<multiple>"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Change properties of up to {0} object"
-msgstr[1] "Change properties of up to {0} objects"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] "Remove old keys from up to {0} object"
+msgstr[1] "Remove old keys from up to {0} objects"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Change properties of up to {0} object"
-msgstr[1] "Change properties of up to {0} objects"
+msgstr[0] "Updating properties of up to {0} object"
+msgstr[1] "Updating properties of up to {0} objects"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "route"
+msgstr "Group"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Stream"
+msgstr "Item"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Search"
+msgstr "Search: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "File"
+msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Car"
+msgstr "Clear"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8604,5 +8622,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Street name"
@@ -8700,24 +8718,21 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Added node on all intersections"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
+msgstr "Delete Ways that are not part of an inner multipolygon"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relation"
+msgstr "Fix relations"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Join overlapping Areas"
+msgstr "Joined self-overlapping area"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Join overlapping Areas"
+msgstr "Joined overlapping areas"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8730,31 +8745,26 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Merging conflicts."
+msgstr "Fix tag conflicts"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Delete from relation"
+msgstr "Removed Element from Relations"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Join Areas: Remove Short Ways"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Unclosed Ways."
+msgstr "Closed Way"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Remove photo from layer"
+msgstr "Remove tags from inner ways"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Motorway Junction"
+msgstr "Join Areas Function"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9351,4 +9361,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9430,7 +9446,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "building"
@@ -9444,5 +9460,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "area"
@@ -9741,4 +9757,9 @@
 msgstr "could not get audio input stream from input URL"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9772,7 +9793,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Create areas"
+msgstr "Create a grid of ways."
 
 #. Plugin DirectUpload
@@ -9825,5 +9845,5 @@
 #: build/trans_plugins.java:23
 msgid "Helps vectorizing WMS images."
-msgstr "Helps vectorizing WMS images."
+msgstr "Helps vectorising WMS images."
 
 #. Plugin livegps
@@ -9880,21 +9900,28 @@
 "Launches FireFox to display the current visible screen as a nice SVG image."
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Provides routing capabilities."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9905,15 +9932,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
+msgstr "Provides a dialog for editing tags in a tabular grid."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9926,15 +9953,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr "Directly load TCX files from JOSM."
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9945,5 +9972,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9954,5 +9981,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9963,5 +9990,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10052,5 +10079,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Reference"
@@ -10105,7 +10132,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Layer"
@@ -10148,5 +10175,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Max. speed (km/h)"
@@ -10194,5 +10221,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Oneway"
@@ -10248,5 +10275,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bridge"
@@ -10296,5 +10323,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -10341,5 +10368,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Cutting"
@@ -10386,5 +10413,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Embankment"
@@ -10542,8 +10569,8 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
-msgstr "Width (meters)"
+msgstr "Width (metres)"
 
 #. item "Streets/Unclassified" text "Width (meters)"
@@ -10590,5 +10617,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Surface"
@@ -10620,5 +10647,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "paved"
@@ -10629,5 +10656,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "unpaved"
@@ -10641,5 +10668,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "cobblestone"
@@ -10791,5 +10818,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10810,6 +10837,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "yes"
@@ -10953,7 +10980,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "no"
@@ -10967,73 +10994,63 @@
 msgstr "Heavy Goods Vehicles (hgv)"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Horse"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motorcycle"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Motorcar"
@@ -11065,15 +11082,15 @@
 #: build/trans_presets.java:322
 msgid "Max. Height (meters)"
-msgstr "Max. Height (meters)"
+msgstr "Max. Height (metres)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
 #: build/trans_presets.java:323
 msgid "Max. Width (meters)"
-msgstr "Max. Width (meters)"
+msgstr "Max. Width (metres)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
 #: build/trans_presets.java:324
 msgid "Max. Length (meters)"
-msgstr "Max. Length (meters)"
+msgstr "Max. Length (metres)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
@@ -11108,130 +11125,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Type"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11239,5 +11144,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11245,11 +11150,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11257,5 +11156,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11263,5 +11162,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11269,5 +11168,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11275,6 +11174,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11293,6 +11198,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "motorway"
@@ -11318,6 +11223,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "trunk"
@@ -11343,6 +11248,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "primary"
@@ -11368,6 +11273,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "secondary"
@@ -11381,5 +11286,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "tertiary"
@@ -11397,5 +11302,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "residential"
@@ -11413,5 +11318,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "service"
@@ -11438,6 +11343,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "construction"
@@ -11478,6 +11383,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11488,5 +11392,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "roundabout"
@@ -11830,14 +11734,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Operator"
@@ -11862,20 +11766,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "uncontrolled"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "traffic_signals"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "island"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "unmarked"
@@ -11883,5 +11787,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
@@ -11890,5 +11794,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "Cross by bicycle"
@@ -11898,5 +11802,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
@@ -12045,10 +11949,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Elevation"
@@ -12061,29 +11966,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Stile"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Edit Stile"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Bollard"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Edit Bollard"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12092,7 +11986,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12101,235 +11998,223 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Allowed traffic:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr "Cycle Barrier"
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Block"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Cattle Grid"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Edit Cattle Grid"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "Bus Trap"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr "Spikes"
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr "Edit Spikes"
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Toll Booth"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Edit Toll Booth"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Border Control point"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Edit Border Control point"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Hedge"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Fence"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Wall"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "City Wall"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Retaining Wall"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Entrance"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Edit an Entrance"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "Gate"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "Edit Gate"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "Lift Gate"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "Edit Lift Gate"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Hampshire Gate"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Edit Hampshire Gate"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Bump Gate"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Edit Bump Gate"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
 msgstr "Edit Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Hampshire Gate"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Edit Hampshire Gate"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Bollard"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Edit Bollard"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Drawbridge"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Edit Drawbridge"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "Bus Trap"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Cattle Grid"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Edit Cattle Grid"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr "Spikes"
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr "Edit Spikes"
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Portcullis"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Edit Portcullis"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "Gate"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "Edit Gate"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr "Lift Gate"
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr "Edit Lift Gate"
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Stile"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Edit Stile"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Sally Port"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Edit Sally Port"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Bump Gate"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Edit Bump Gate"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr "Cycle Barrier"
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Hedge"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Fence"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Block"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Wall"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "City Wall"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Retaining Wall"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Toll Booth"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Edit Toll Booth"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Border Control point"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Edit Border Control point"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Entrance"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Edit an Entrance"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Water"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Spring"
@@ -12337,5 +12222,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Edit Spring"
@@ -12343,5 +12228,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Drain"
@@ -12349,10 +12234,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Edit Drain"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Stream"
@@ -12360,10 +12245,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Edit Stream"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Canal"
@@ -12371,10 +12256,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Edit Canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "River"
@@ -12384,5 +12269,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Edit River"
@@ -12390,15 +12275,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Edit Water"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Edit Land"
@@ -12406,15 +12291,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Basin"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Edit Basin Landuse"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -12422,15 +12307,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Edit Reservoir Landuse"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Covered Reservoir"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Edit Covered Reservoir"
@@ -12438,5 +12323,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Riverbank"
@@ -12445,10 +12330,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Edit Riverbank"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Wetland"
@@ -12459,56 +12344,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Edit Wetland"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "swamp"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "bog"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "marsh"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "reedbed"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "saltmarsh"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "tidalflat"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Mud"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Edit Mud"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Beach"
@@ -12516,20 +12401,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Edit Beach"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Bay"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Edit Bay"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Cliff"
@@ -12537,10 +12422,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Edit Cliff"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Coastline"
@@ -12548,5 +12433,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Edit Coastline"
@@ -12554,5 +12439,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Ferry Route"
@@ -12560,5 +12445,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Edit Ferry"
@@ -12567,5 +12452,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Boatyard"
@@ -12573,10 +12458,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Edit Boatyard"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Dock"
@@ -12584,5 +12469,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Edit Dock"
@@ -12590,5 +12475,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Dam"
@@ -12596,15 +12481,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Edit Dam"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Waterway Point"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -12613,5 +12498,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Weir"
@@ -12619,20 +12504,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Edit Weir"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Waterfall"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Edit Waterfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Turning Point"
@@ -12641,15 +12526,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Edit Marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Pier"
@@ -12657,10 +12542,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Edit Pier"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Ferry Terminal"
@@ -12668,10 +12553,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Edit Ferry Terminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Slipway"
@@ -12681,5 +12566,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Edit Slipway"
@@ -12687,10 +12572,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Railway"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Railway"
@@ -12698,5 +12583,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Edit Railway"
@@ -12726,8 +12611,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Optional Types"
@@ -12741,35 +12626,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "yard"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "siding"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "spur"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Narrow Gauge Railway"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edit Narrow Gauge Railway"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Monorail"
@@ -12777,45 +12662,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Edit Monorail"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Preserved"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Edit Preserved Railway"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Light Rail"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Edit Light Rail"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Subway"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Edit Subway"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Tram"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Edit Tram"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Bus Guideway"
@@ -12823,5 +12708,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Edit Bus Guideway"
@@ -12830,14 +12715,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Disused Rail"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Edit Disused Railway"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Abandoned Rail"
@@ -12846,5 +12731,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Level Crossing"
@@ -12853,5 +12738,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Crossing"
@@ -12861,5 +12746,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr "Crossing type"
@@ -12867,5 +12752,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Turntable"
@@ -12874,10 +12759,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Aerialway"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Chair Lift"
@@ -12885,10 +12770,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Edit Chair Lift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Drag Lift"
@@ -12896,10 +12781,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Edit Drag Lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Cable Car"
@@ -12907,24 +12792,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Edit Cable Car"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Edit Golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Station"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Edit Station"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Fuel"
@@ -12934,5 +12832,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Edit Fuel"
@@ -12948,5 +12846,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12956,5 +12854,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Edit Parking"
@@ -12962,40 +12860,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Capacity"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "surface"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "multi-storey"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "underground"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "park_and_ride"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Spaces for Disabled"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Fee"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Wash"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Edit Car Wash"
@@ -13003,5 +12902,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Shop"
@@ -13009,15 +12908,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Repair"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Edit Car Repair"
@@ -13025,5 +12924,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Rental"
@@ -13032,10 +12931,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Edit Car Rental"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Sharing"
@@ -13043,5 +12942,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Edit Car Sharing"
@@ -13049,5 +12948,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Edit Bicycle Parking"
@@ -13056,5 +12955,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Edit Bicycle Rental"
@@ -13063,15 +12962,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Public Transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -13079,5 +12978,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Railway Halt"
@@ -13085,5 +12984,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Edit Halt"
@@ -13091,5 +12990,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Tram Stop"
@@ -13098,5 +12997,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Edit Tram Stop"
@@ -13104,5 +13003,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Railway Platform"
@@ -13111,5 +13010,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Edit Railway Platform"
@@ -13121,5 +13020,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "Reference (track number)"
@@ -13127,10 +13026,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Subway Entrance"
@@ -13139,10 +13038,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Edit Subway Entrance"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -13151,5 +13050,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -13158,5 +13057,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Edit Bus Station"
@@ -13164,5 +13063,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Bus Stop"
@@ -13172,5 +13071,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Edit Bus Stop"
@@ -13178,10 +13077,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -13189,5 +13088,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13195,5 +13094,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Edit Taxi station"
@@ -13201,5 +13100,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Airport"
@@ -13207,15 +13106,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Edit Airport"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13224,5 +13123,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -13234,5 +13133,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -13241,15 +13140,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Edit Hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motel"
@@ -13257,20 +13156,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Chalet"
@@ -13278,10 +13177,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Hostel"
@@ -13289,30 +13188,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -13320,10 +13219,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -13334,5 +13233,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -13340,5 +13239,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
@@ -13346,5 +13245,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -13352,61 +13251,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -13414,9 +13313,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Cafe"
@@ -13424,10 +13323,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Pub"
@@ -13435,20 +13334,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "Bar"
@@ -13456,10 +13355,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -13467,20 +13366,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
@@ -13489,11 +13388,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Opening Hours"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "Museum"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "Edit Museum"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "Zoo"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "Edit Zoo"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "Viewpoint"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "Edit Viewpoint"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Look-Out Tower"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "Theme Park"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "Edit Theme Park"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "Artwork"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "Edit Artwork"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "Information Office"
@@ -13501,143 +13461,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
 msgstr "Edit Information Office"
 
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "Museum"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "Edit Museum"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "Zoo"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "Edit Zoo"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "Viewpoint"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "Edit Viewpoint"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Look-Out Tower"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "Theme Park"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "Edit Theme Park"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "Artwork"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "Edit Artwork"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr "Map Type"
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr "map"
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr "citymap"
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr "hikingmap"
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr "bicyclemap"
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr "Closer Description"
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr "Information Board"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr "Board Type"
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr "board"
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr "history"
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr "nature"
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr "wildlife"
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr "Guidepost (Hiking)"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr "Map Type"
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr "map"
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr "citymap"
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr "hikingmap"
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr "bicyclemap"
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr "Closer Description"
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr "Information Board"
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr "Board Type"
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr "board"
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr "history"
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr "nature"
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr "wildlife"
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Shelter"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -13645,25 +13545,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Castle"
@@ -13672,20 +13572,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -13694,20 +13594,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Battlefield"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Edit Battlefield"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Memorial"
@@ -13715,56 +13627,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Battlefield"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Edit Battlefield"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Playground"
@@ -13772,15 +13673,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
@@ -13788,15 +13689,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -13810,6 +13711,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "select sport:"
@@ -13888,4 +13789,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14177,28 +14086,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "sport"
@@ -14208,227 +14118,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -14467,191 +14377,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "10pin"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Archery"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Cycling"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Skating"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Skiing"
@@ -14659,56 +14569,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "intermediate"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "Shooting"
@@ -14716,178 +14628,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "American Football"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Edit American Football"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Edit Rugby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Buildings"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Building"
@@ -14895,5 +14807,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Public Building"
@@ -14901,10 +14813,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Town hall"
@@ -14912,10 +14824,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Embassy"
@@ -14923,10 +14835,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -14935,10 +14847,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Prison"
@@ -14947,10 +14859,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Police"
@@ -14960,10 +14872,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -14972,10 +14884,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Post Office"
@@ -14983,5 +14895,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -14989,15 +14901,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "School"
@@ -15005,10 +14917,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "University"
@@ -15016,10 +14928,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "College"
@@ -15027,5 +14939,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Edit College"
@@ -15033,5 +14945,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Cinema"
@@ -15040,10 +14952,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Library"
@@ -15052,10 +14964,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Edit Library"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -15063,10 +14975,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Theatre"
@@ -15075,10 +14987,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -15088,5 +15000,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -15095,6 +15007,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Religion"
@@ -15103,66 +15015,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "unitarianist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Denomination"
@@ -15171,81 +15084,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Addresses"
@@ -15254,5 +15167,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -15260,5 +15173,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "House number"
@@ -15266,20 +15179,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "House name"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "City name"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Country code"
@@ -15287,5 +15200,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15294,5 +15207,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -15300,67 +15213,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "all"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "athletics"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Works"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Tower"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -15368,10 +15286,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Windmill"
@@ -15379,10 +15297,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -15390,10 +15308,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -15403,10 +15321,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Crane"
@@ -15414,10 +15332,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Edit Crane"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Beacon"
@@ -15425,10 +15343,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -15436,10 +15354,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -15447,5 +15365,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
@@ -15453,5 +15371,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -15461,39 +15379,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Power Station"
@@ -15502,10 +15420,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -15514,5 +15432,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -15520,10 +15438,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -15534,5 +15452,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
@@ -15540,5 +15458,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Power Line"
@@ -15547,25 +15465,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Amount of Wires"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Toilets"
@@ -15573,25 +15491,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Reference number"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Charge"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telephone"
@@ -15600,5 +15513,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -15606,5 +15519,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Coins"
@@ -15612,5 +15525,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Notes"
@@ -15618,5 +15531,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -15624,5 +15537,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -15630,15 +15543,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Recycling"
@@ -15647,5 +15560,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -15653,35 +15566,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Bench"
@@ -15690,20 +15603,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Hide"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Lock"
@@ -15711,22 +15624,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Fountain"
@@ -15735,10 +15648,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -15747,10 +15660,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -15758,25 +15671,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -15784,10 +15697,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -15795,10 +15708,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -15806,5 +15719,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -15812,88 +15725,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Butcher"
@@ -15901,10 +15814,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Baker"
@@ -15912,10 +15825,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Florist"
@@ -15923,70 +15836,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "Organic"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "School"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Edit Shoe Shop"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -15994,10 +15921,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "Hardware"
@@ -16005,10 +15932,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -16016,60 +15943,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Toys"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -16077,10 +16004,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Laundry"
@@ -16088,10 +16015,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -16099,35 +16026,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "sports"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Sport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "optician"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Bank"
@@ -16135,5 +16064,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Edit Bank"
@@ -16141,10 +16070,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -16152,5 +16081,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -16158,15 +16087,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Doctors"
@@ -16174,20 +16103,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -16195,5 +16124,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -16201,10 +16130,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "Dispensing"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Hospital"
@@ -16212,10 +16141,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -16224,5 +16153,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -16231,20 +16160,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -16252,5 +16181,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -16259,25 +16188,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Country"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Edit Country"
@@ -16285,45 +16214,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "State"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "County"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Edit County"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "City"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Town"
@@ -16331,10 +16261,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Suburb"
@@ -16342,30 +16272,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Village"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Locality"
@@ -16373,10 +16304,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Island"
@@ -16384,5 +16315,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Edit Island"
@@ -16390,5 +16321,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -16396,10 +16327,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Peak"
@@ -16407,10 +16338,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Glacier"
@@ -16418,10 +16349,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Volcano"
@@ -16429,70 +16360,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "National"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr "Political"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr "National park"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Tree"
@@ -16501,15 +16432,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Wood"
@@ -16518,5 +16449,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -16524,17 +16455,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Forest"
@@ -16543,19 +16474,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Scree"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Edit Scree"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Scrub"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Edit Scrub"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Fell"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Edit Fell"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Heath"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Edit Heath"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -16564,70 +16539,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Garden"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Grass"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "Village Green"
@@ -16635,10 +16611,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Common"
@@ -16646,20 +16622,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -16667,5 +16643,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -16673,15 +16649,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -16689,9 +16665,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -16699,39 +16675,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Retail"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Railway land"
@@ -16739,114 +16715,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Military"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Edit Military Landuse"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Construction area"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Edit Construction Landuse"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Construction area"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Edit Construction Landuse"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Military"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Edit Military Landuse"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Scree"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Edit Scree"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Scrub"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Edit Scrub"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Fell"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Edit Fell"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Heath"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Edit Heath"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -16856,5 +16789,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -16863,10 +16796,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "outer segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "inner segment"
@@ -16874,5 +16807,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -16881,5 +16814,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -16887,34 +16820,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -16923,15 +16856,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "to way"
@@ -16939,5 +16872,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Route"
@@ -16946,5 +16879,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -16952,5 +16885,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Route type"
@@ -17022,24 +16955,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "bicycle"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "ski"
@@ -17084,4 +17017,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17091,19 +17027,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "foot"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "hiking"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "detour"
@@ -17117,10 +17054,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -17128,26 +17065,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -17156,30 +17093,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -17363,4 +17300,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17372,4 +17416,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17471,11 +17524,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "deprecated"
@@ -17517,7 +17572,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "horse"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Barriers"
 
 #. color tertiary
@@ -17553,6 +17823,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "street"
@@ -17608,7 +17878,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "highway_track"
@@ -17655,108 +17925,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "rail"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viaduct"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17773,4 +17956,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "service"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17780,4 +17969,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Ford"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17794,8 +17989,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "turningcircle"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "Emergency Access Point"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17807,5 +18016,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "riverbank"
@@ -17819,5 +18028,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "stream"
@@ -17831,5 +18040,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "dock"
@@ -17857,5 +18066,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "aqueduct"
@@ -17870,4 +18079,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17907,5 +18117,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18022,12 +18232,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "manmade"
@@ -18073,5 +18284,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18089,7 +18300,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr "railwaypoint"
@@ -18112,10 +18323,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr "otherrail"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr "railover"
@@ -18145,6 +18356,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr "oldrail"
@@ -18189,6 +18400,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "aeroway"
@@ -18202,5 +18413,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminal"
@@ -18222,5 +18433,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "aeroway_dark"
@@ -18234,5 +18445,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -18255,4 +18466,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18272,4 +18491,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "aerialway"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18278,23 +18503,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "aerialway"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "piste_easy"
@@ -18308,5 +18520,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "piste_intermediate"
@@ -18320,5 +18533,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "piste_advanced"
@@ -18331,6 +18545,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "piste_freeride"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "piste_freeride"
@@ -18344,5 +18573,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "piste_novice"
@@ -18373,4 +18603,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18405,4 +18643,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18415,8 +18677,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "power"
@@ -18429,5 +18693,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "pier"
@@ -18441,5 +18708,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "pipeline"
@@ -18567,12 +18834,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "leisure"
@@ -18586,5 +18853,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "marina"
@@ -18656,8 +18923,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "amenity"
@@ -18693,4 +18960,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18750,11 +19025,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "amenity_traffic"
@@ -18893,6 +19168,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19119,22 +19415,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "amenity_light"
@@ -19166,6 +19462,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "light_water"
@@ -19201,4 +19497,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19218,7 +19522,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "health"
@@ -19312,4 +19617,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19512,4 +19825,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19543,28 +19872,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "shop"
@@ -19618,4 +19949,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19628,8 +19967,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotel"
@@ -19684,4 +20023,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19778,9 +20118,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "tourism"
@@ -19852,8 +20192,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "historic"
@@ -19923,9 +20263,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "green"
@@ -19939,5 +20279,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "quarry"
@@ -19951,5 +20291,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "landfill"
@@ -19971,5 +20311,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "basin"
@@ -19983,5 +20323,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "forest"
@@ -19995,5 +20335,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "farmyard"
@@ -20016,5 +20356,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "retail"
@@ -20028,5 +20368,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "industrial"
@@ -20040,5 +20380,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "brownfield"
@@ -20052,5 +20392,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "greenfield"
@@ -20064,5 +20404,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "railland"
@@ -20119,7 +20459,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "military"
@@ -20133,5 +20473,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "cemetery"
@@ -20144,5 +20484,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "peak"
@@ -20157,5 +20497,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "glacier"
@@ -20169,5 +20509,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "volcano"
@@ -20182,4 +20522,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20221,7 +20562,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "natural"
@@ -20235,5 +20577,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "scrub"
@@ -20247,5 +20589,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "heath"
@@ -20259,5 +20601,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "wood"
@@ -20271,5 +20613,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "mud"
@@ -20283,5 +20625,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "beach"
@@ -20359,8 +20701,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "route"
@@ -20408,7 +20750,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "boundary"
@@ -20550,10 +20892,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "place"
@@ -20594,6 +20936,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "address"
@@ -20875,324 +21224,51 @@
 msgstr "Streets NRW Geofabrik.de"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-
-#~ msgid "Navigate"
-#~ msgstr "Navigate"
-
-#~ msgid "Navigator"
-#~ msgstr "Navigator"
-
-#~ msgid "Set start/end for routing. Middle mouse button to reset."
-#~ msgstr "Set start/end for routing. Middle mouse button to reset."
-
-#~ msgid "Reset Graph"
-#~ msgstr "Reset Graph"
-
-#~ msgid "Provides navigation/autorouting functionality"
-#~ msgstr "Provides navigation/autorouting functionality"
-
-#~ msgid "Error while exporting {0}"
-#~ msgstr "Error while exporting {0}"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Please select something from the conflict list."
-
-#~ msgid "Please select a color."
-#~ msgstr "Please select a colour."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Don't launch in fullscreen mode"
-
-#~ msgid "News about JOSM"
-#~ msgstr "News about JOSM"
-
-#~ msgid "OSM History Information"
-#~ msgstr "OSM History Information"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Click to create a new way to the existing node."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Click to make a connection to the existing node."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Click to insert a node and create a new way."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Click to insert a new node and make a connection."
-
-#~ msgid "Search ..."
-#~ msgstr "Search ..."
-
-#~ msgid " ({0} node)"
-#~ msgid_plural " ({0} nodes)"
-#~ msgstr[0] " ({0} node)"
-#~ msgstr[1] " ({0} nodes)"
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr "Please select objects for which you want to change properties."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-
-#~ msgid "Highlight the member from the current table row as JOSM's selection"
-#~ msgstr "Highlight the member from the current table row as JOSM's selection"
-
-#~ msgid "Selection: %d way(s) and %d node(s)"
-#~ msgstr "Selection: %d way(s) and %d node(s)"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Upload this trace..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Upload track filtered by JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Upload raw file: "
-
-#~ msgid "Description:"
-#~ msgstr "Description:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Tags (keywords in GPX):"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "GPX-Upload"
-
-#~ msgid "time"
-#~ msgstr "time"
-
-#~ msgid "desc"
-#~ msgstr "desc"
-
-#~ msgid "symbol"
-#~ msgstr "symbol"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Upload raw file: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Tags:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "Choose the hue for the track colour by the velocity at that point."
-
-#~ msgid "Unknown type"
-#~ msgstr "Unknown type"
-
-#~ msgid "NullPointerException, Possibly some missing tags."
-#~ msgstr "NullPointerException, Possibly some missing tags."
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Edit an Exit"
-
-#~ msgid "Exit Number"
-#~ msgstr "Exit Number"
-
-#~ msgid "Exit Name"
-#~ msgstr "Exit Name"
-
-#~ msgid "Waterway"
-#~ msgstr "Waterway"
-
-#~ msgid "Information point"
-#~ msgstr "Information point"
-
-#~ msgid "Provider"
-#~ msgstr "Provider"
-
-#~ msgid "political"
-#~ msgstr "political"
-
-#~ msgid "National_park"
-#~ msgstr "National_park"
-
-#~ msgid "Natural"
-#~ msgstr "Natural"
-
-#~ msgid "Add Site"
-#~ msgstr "Add Site"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Delete Site(s)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Please select the site to delete."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Check Site(s)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Please select the site(s) to check for updates."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Add a new plugin site."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Delete the selected site(s) from the list."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr "Check the selected site(s) for new plugins or updates."
-
-#~ msgid "Update Sites"
-#~ msgstr "Update Sites"
-
-#~ msgid "Version"
-#~ msgstr "Version"
-
-#~ msgid "Install"
-#~ msgstr "Install"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Version: {0}<br>Last change at {1}"
-
-#~ msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-#~ msgstr "SurveyorPlugin depends on LiveGpsPlugin!"
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr "LiveGpsPlugin not found, please install and activate."
-
-#~ msgid "SurveyorPlugin is disabled for the moment"
-#~ msgstr "SurveyorPlugin is disabled for the moment"
-
-#~ msgid "SurveyorPlugin"
-#~ msgstr "SurveyorPlugin"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Version {0} - Last change at {1}"
-
-#~ msgid "Duplicated nodes."
-#~ msgstr "Duplicated nodes."
-
-#~ msgid "Similar named ways."
-#~ msgstr "Similarly named ways."
-
-#~ msgid "Open waypoints file"
-#~ msgstr "Open waypoints file"
-
-#~ msgid "Open a waypoints file."
-#~ msgstr "Open a waypoints file."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "Data error: lat value \"{0}\" is out of bounds."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "Data error: lon value \"{0}\" is out of bounds."
-
-#~ msgid ""
-#~ "<html>Fulltext search:<ul><li><b>Baker Street</b> - 'Baker' and 'Street' "
-#~ "in any key or name.</li><li><b>\"Baker Street\"</b> - 'Baker Street' in "
-#~ "any key or name.</li><li><b>name:Bak</b> - 'Bak' anywhere in the name.</"
-#~ "li><li><b>-name:Bak</b> - not 'Bak' in the name.</li><li><b>foot:</b> - "
-#~ "key=foot set to any value.</li><li>Special targets:</li><li><b>type:</b> "
-#~ "- type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)</"
-#~ "li><li><b>user:</b>... - all objects changed by user</li><li><b>id:</"
-#~ "b>... - object with given ID</li><li><b>nodes:</b>... - object with given "
-#~ "number of nodes</li><li><b>modified</b> - all changed objects</"
-#~ "li><li><b>selected</b> - all selected objects</li><li><b>incomplete</b> - "
-#~ "all incomplete objects</li><li>Use <b>|</b> or <b>OR</b> to combine with "
-#~ "logical or</li><li>Use <b>\"</b> to quote operators (e.g. if key "
-#~ "contains :)</li><li>Use <b>(</b> and <b>)</b> to group expressions</li></"
-#~ "ul></html>"
-#~ msgstr ""
-#~ "<html>Fulltext search:<ul><li><b>Baker Street</b> - 'Baker' and 'Street' "
-#~ "in any key or name.</li><li><b>\"Baker Street\"</b> - 'Baker Street' in "
-#~ "any key or name.</li><li><b>name:Bak</b> - 'Bak' anywhere in the name.</"
-#~ "li><li><b>-name:Bak</b> - not 'Bak' in the name.</li><li><b>foot:</b> - "
-#~ "key=foot set to any value.</li><li>Special targets:</li><li><b>type:</b> "
-#~ "- type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)</"
-#~ "li><li><b>user:</b>... - all objects changed by user</li><li><b>id:</"
-#~ "b>... - object with given ID</li><li><b>nodes:</b>... - object with given "
-#~ "number of nodes</li><li><b>modified</b> - all changed objects</"
-#~ "li><li><b>selected</b> - all selected objects</li><li><b>incomplete</b> - "
-#~ "all incomplete objects</li><li>Use <b>|</b> or <b>OR</b> to combine with "
-#~ "logical or</li><li>Use <b>\"</b> to quote operators (e.g. if key "
-#~ "contains :)</li><li>Use <b>(</b> and <b>)</b> to group expressions</li></"
-#~ "ul></html>"
-
-#~ msgid "Add Node"
-#~ msgstr "Add Node"
-
-#~ msgid "Signpost"
-#~ msgstr "Signpost"
-
-#~ msgid "office"
-#~ msgstr "office"
-
-#~ msgid "guidepost"
-#~ msgstr "guidepost"
-
-#~ msgid "NoName"
-#~ msgstr "NoName"
-
-#~ msgid "Ref"
-#~ msgstr "Ref"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Update Site URL"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Invalid URL"
-
-#~ msgid "unusual named way type"
-#~ msgstr "unusual named way type"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Download \"Message of the day\""
-
-#~ msgid "Open map features in browser"
-#~ msgstr "Open map features in browser"
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "The \"{0}\" way must contain at least 2 nodes."
-
-#~ msgid "Upload GPX track"
-#~ msgstr "Upload GPX track"
-
-#~ msgid "Direct Upload to OpenStreetMap"
-#~ msgstr "Direct Upload to OpenStreetMap"
-
-#~ msgid "Starting to upload selected file to openstreetmap.org"
-#~ msgstr "Starting to upload selected file to openstreetmap.org"
-
-#~ msgid "Transferring data to server"
-#~ msgstr "Transferring data to server"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "How many buildings are in the terrace?"
-
-#~ msgid "Update available"
-#~ msgstr "Update available"
-
-#~ msgid "Version Details:"
-#~ msgstr "Version Details:"
-
-#~ msgid ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
-#~ msgstr ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Open..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Description"
+
+#~ msgid "Commit comment"
+#~ msgstr "Commit comment"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Server does not support changesets"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Really mark this issue as ''done''?"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "Remove route nodes"
+
+#~ msgid "Start routing"
+#~ msgstr "Start routing"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Drawbridge"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Edit Drawbridge"
+
+#~ msgid "Portcullis"
+#~ msgstr "Portcullis"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Edit Portcullis"
+
+#~ msgid "Charge"
+#~ msgstr "Charge"
+
+#~ msgid "sports"
+#~ msgstr "sports"
+
+#~ msgid "viaduct"
+#~ msgstr "viaduct"
Index: /applications/editors/josm/i18n/po/es.po
===================================================================
--- /applications/editors/josm/i18n/po/es.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/es.po	(revision 14844)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-30 14:53+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-25 16:08+0000\n"
 "Last-Translator: Emilio Gómez Fernández <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Creando la interfaz de usuario principal"
@@ -38,38 +38,38 @@
 "EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Cambios no guardados"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Existen cambios sin guardar. ¿Desea descartarlos y continuar?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Guardar y salir"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Descartar y salir"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -80,10 +80,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -94,4 +94,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -101,10 +102,10 @@
 msgstr "Cancelar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL malformada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -130,8 +131,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -272,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -407,6 +408,6 @@
 msgstr "Invertir y combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -414,20 +415,20 @@
 msgstr "Introduzca valores para todos los conflictos."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Resolver conflictos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Todas la vías están vacías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -532,5 +533,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -651,6 +652,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -659,6 +660,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -713,5 +714,5 @@
 #, java-format
 msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-msgstr ""
+msgstr "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">english</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
@@ -721,4 +722,6 @@
 "\">your language</A>."
 msgstr ""
+"Página de ayuda perdida. Crearla en <A HREF=\"{0}\">english</A> or <A HREF="
+"\"{1}\">spanish</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:25
@@ -785,10 +788,10 @@
 msgstr "Unir de todos modos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "No se pueden unir los nodos: Debe borrar la vía que todavía está en uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1067,5 +1070,5 @@
 msgstr "Guardar los datos actuales."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1075,26 +1078,26 @@
 "favor comunique esto como fallo."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Ningún documento abierto luego nada por grabar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Documento vacío"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "El documentos no contiene datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Guardar igualmente"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Conflictos"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1104,32 +1107,32 @@
 "gestionarán si rechazas todo. ¿Continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Rechazar conflictos y guardar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Grabar el archivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Guardar el archivo OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "No se pudo salvaguardar el archivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Extensión de archivo desconocida."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Ocurrió un error al guardar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Ocurrió un error al restaurar el archivo de salvaguarda."
@@ -1187,18 +1190,18 @@
 msgstr "Cerrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Separar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Separar vía por el nodo seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "La selección actual no se puede usar para separar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1206,5 +1209,5 @@
 msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1220,9 +1223,9 @@
 "seleccione la vía también."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "Los nodos seleccionados no comparten la misma vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1230,10 +1233,10 @@
 msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Debe seleccionar dos o más nodos para separar una vía circular."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1243,5 +1246,5 @@
 "de la mitad de la vía)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1252,5 +1255,5 @@
 "Debe verificar esto y corregirlo donde sea necesario."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1405,47 +1408,51 @@
 "continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Subir todos los cambios al servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Objetos que añadir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Objetos que modificar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Objetos que borrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Introduzca un breve comentario sobre los cambios que se está subiendo:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "¿Subir estos cambios?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Subir cambios"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algunos datos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr ""
 "Existen algunos conflictos sin resolver. Tienes que solucionarlos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Ningún cambio que subir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Subiendo datos"
@@ -1631,31 +1638,33 @@
 msgstr "No se puede añadir un nodo fuera del mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Añadir nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Añadir nodo a la vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Conectar la vía existente al nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Añadir un nuevo nodo a la vía existente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Añadir un nodo a la vía y conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Crear un nuevo nodo."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Seleccione un nodo con el cursor."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1664,9 +1673,4 @@
 msgstr[0] "Insertar un nuevo nodo en la vía."
 msgstr[1] "Insertar un nuevo nodo en {0} vías."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Seleccione un nodo con el cursor."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2096,5 +2100,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2293,5 +2297,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "Ferrocarril"
@@ -2313,127 +2317,127 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Estilo de área sin cerrar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "La vía multipoligonal ''{0}'' no está cerrada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Miembro vacío en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Borrado miembro ''{0}''  en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "La vía ''{0}''  con menos de dos puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Encontrado más de un \"desde\" en la vía."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Encontrado más de un \"hacia\" en la vía."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "Encontrada más de una \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rol desconocido ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo desconocido para el miembro \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Ningún \"desde\" encontrado en la vía."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Ningún \"hacia\" encontrado en la vía."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "No se ha especificado una \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "El tramo \"from\" no comienza o termina en un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "El tramo \"to\" no comienza o termina en un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "El tramo \"from\" no comienza o termina en un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "El tramo \"to\" no comienza o termina en un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stilo para la restricción {0} no encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "La no-vía ''{0}'' en multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ninguna vía exterior en el multipolígono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersección entre las vías ''{0}'' y ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "El estilo de la vía exterior ''{0}'' no coincide."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "texto"
@@ -2441,5 +2445,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2467,5 +2471,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "fondo"
@@ -2532,5 +2536,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2544,5 +2548,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2572,14 +2576,14 @@
 msgstr "versión resuelta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Mensaje del dia no está disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+msgstr "- la versión en ejecucióñ es {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaje del día\""
@@ -2651,14 +2655,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Nombre de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -2666,57 +2670,57 @@
 "No se puede encontrar traducción para el escenario {0}. Revertiendo a {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Argumento de geometría standard de unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Bajar el rectángulo límite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Abrir archivo (como gps crudo si es .gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Bajar el rectángulo límite como gps crudo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Seleccionar dentro de la búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+msgstr "Lanzar en modo maximizado"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Restablecer las preferencias a los valores por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Establezca idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "ejemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2726,23 +2730,28 @@
 "asegúrese que carga algún dato antes de --seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "En vez de  --bajar=<bbox> puede especificar osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Activando los complementos actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Cargando los primeros complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Ajustes por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Cargando los complementos"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2784,5 +2793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242
 msgid "Full Screen"
-msgstr ""
+msgstr "Pantalla completa"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
@@ -2920,5 +2929,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3135,5 +3144,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Rol"
@@ -3181,73 +3190,71 @@
 msgstr "Propiedades / Miembros"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Aplicar cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Crear nueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Editar nueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Editar relación #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Básico"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Ocupado por"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Etiquetas (un valor nulo borra la etiqueta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Mover hacia arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Mover los miembro(s) seleccionos hacia arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Añadir seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Añadir todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Eliminar seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Eliminar todos los objetos seleccionados de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Mueve hacia abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Mover los miembros seleccionados hacia abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3256,36 +3263,36 @@
 msgstr "Eliminar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Quitar el miembro en la fila de tabla actual de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas las vías y nodos incompletos de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Miembros: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editor de relación: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Existieron conflictos durante la importación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Error analizando la respuesta del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "No se puede conectar con el servidor"
@@ -3299,10 +3306,11 @@
 msgstr "Borrar la relación seleccionada"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relaciones"
@@ -3498,5 +3506,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Lugares"
@@ -3543,21 +3551,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "tipo"
@@ -3611,10 +3619,7 @@
 "Puede usar el ratón o las teclas Ctrl+Flecha para hacer zoom y desplazamiento"
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Mapa"
@@ -3769,4 +3774,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3872,5 +3878,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3922,4 +3928,7 @@
 "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:1024
@@ -3931,19 +3940,34 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Versión {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} borrados.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "uso"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Versión {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3951,21 +3975,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4168,5 +4192,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Modified times (time stamps) of audio files."
-msgstr ""
+msgstr "Modificado el registro temporal de los archivos de audio."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
@@ -4415,5 +4439,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4498,4 +4522,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4579,7 +4605,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4592,7 +4615,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4608,10 +4638,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4780,5 +4810,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4812,7 +4844,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4896,4 +4928,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4946,4 +4986,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4952,7 +4998,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4961,15 +5004,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4994,129 +5026,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Nombre"
@@ -5165,12 +5199,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Cargar todas las teselas"
+msgstr "Archivos locales"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zona"
+msgstr "Ninguno"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5199,45 +5231,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Coche"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Bicicleta"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5245,25 +5267,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Pie"
@@ -5311,7 +5338,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS."
+msgstr "Dibujar líneas entre puntos GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5960,10 +5986,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, Posiblemente faltan algunas etiquetas."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Preparando datos..."
@@ -5975,25 +6001,75 @@
 "documento gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Abriendo conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Cerrando conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Ningún cambio que subir"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Preparando…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Subiendo..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Error analizando la respuesta del servidor"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Host desconocido"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Contraseña o nombre de usuario incorrectos"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: La contraseña se transferirá sin cifrar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Grabar nombre de usuario y contraseña (sin cifrar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -6004,44 +6080,52 @@
 msgstr "Error durante el análisis sintáctico."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Versión desconocida"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Versión desconocida"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Encontrado elemento <nd> en una no Vía"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> no tiene ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Encontrada una etiqueta <miembro> fuera de una relación."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <miembro> incompleta sin ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Objeto con id=0 ilegal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Falta el atributo necesario \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Obviando una vía porque incluye un nodo que no existe: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "id del nodo mal formado"
@@ -6051,5 +6135,5 @@
 msgstr "Contactando con el servidor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -6058,5 +6142,5 @@
 "conexión a Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6066,55 +6150,8 @@
 "tarde."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Introduzca un breve comentario a los cambios que se están subiendo:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Envíe comentario"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), Faltan {3}. Actualizando {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Ha ocurrido un error: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Abriendo conjunto de cambios..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "El servidor no soporta conjuntos de cambios"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Host desconocido"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Preparando…"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Subiendo..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Cerrando conjunto de cambios..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Transferencia abortada debido a un error (se esperará 5 segundos):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6215,5 +6252,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
 msgid "Keep plugin"
-msgstr ""
+msgstr "Mantener componente"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -6293,6 +6330,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "desconocido"
@@ -6480,7 +6517,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Crear áreas"
+msgstr "Crear rejilla de vías"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6489,17 +6525,18 @@
 "in common"
 msgstr ""
+"Forma una cuadrícula de viales basándose en dos vías ya existentes que "
+"poseen varios nodos y uno de ellos en común"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Seleccionar dos caminos con un nodo en común"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Seleccionar dos vías con solo un nodo en común"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Crear áreas"
+msgstr "Crear rejilla de vías"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6523,5 +6560,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Descripción"
@@ -6949,17 +6986,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:16
 msgid "Lambert Zone 1 cache file (.1)"
-msgstr ""
+msgstr "Archivo caché de la zona Lambert 1 (.1)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17
 msgid "Lambert Zone 2 cache file (.2)"
-msgstr ""
+msgstr "Archivo caché de la zona Lambert 2 (.2)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18
 msgid "Lambert Zone 3 cache file (.3)"
-msgstr ""
+msgstr "Archivo caché de la zona Lambert 3 (.3)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19
 msgid "Lambert Zone 4 cache file (.4)"
-msgstr ""
+msgstr "Archivo caché de la zona Lambert 4 (.4)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
@@ -6988,5 +7025,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:306
 msgid "Select Tableau d'Assemblage"
-msgstr ""
+msgstr "Seleccione tabla de montaje"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129
@@ -7050,4 +7087,10 @@
 "by this plugin."
 msgstr ""
+"Un componente especial para el manejo del servidor WMS del catastro francés "
+"en www.cadastre.gouv.fr<BR><BR>Por favor, lea los Términos y Condiciones de "
+"Uso aquí (en francés):<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>antes de subir cualquier dato "
+"creado mediante este componente."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
@@ -7058,4 +7101,6 @@
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
+"<html>Valor de la clave \"source\" cuando el registro automático está "
+"activo</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
@@ -7098,5 +7143,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
 msgid "Image grab multiplier:"
-msgstr ""
+msgstr "División de la zona de descarga:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -7150,4 +7195,6 @@
 "building import size is limited to 1 km2 max."
 msgstr ""
+"Para evitar sobrecargar el servidor WMS del Catastro\n"
+"la importación de archivo está limitada a 1km2 como máximo."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
@@ -7155,4 +7202,5 @@
 msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
+"Por favor, active el autoabastecimiento y compruebe el catastro Millesime."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
@@ -7170,5 +7218,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
 msgid "Extract commune boundary"
-msgstr ""
+msgstr "Extraer los límites de la comuna"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -7179,5 +7227,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
 msgid "Extract building footprints"
-msgstr ""
+msgstr "Estraer las huellas de los edificios"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
@@ -7234,4 +7282,6 @@
 "known by www.cadastre.gouv.fr .</html>"
 msgstr ""
+"<html>Introduzca el nombre de la población.<br>Utilice la sintaxis y la "
+"puntuación conocida por www.cadastre.gouv.fr.</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
@@ -7275,4 +7325,6 @@
 "Select one of them first, then retry"
 msgstr ""
+"Más de una capa WMS presente\n"
+"Seleccione primero una de ellas y reinténtelo"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81
@@ -7285,5 +7337,5 @@
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
+msgstr "Capa WMS ({0}), {1} tesela(s) cargada"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
@@ -7303,5 +7355,5 @@
 #, java-format
 msgid "Commune bbox: {0}"
-msgstr ""
+msgstr "Cuadro de la Comunna: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283
@@ -7332,4 +7384,6 @@
 "Create a new one."
 msgstr ""
+"Versión del archivo caché no soportada; encontrado {0}, esperado {1}\n"
+"Creado uno nuevo."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527
@@ -7799,7 +7853,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "lámina de agua"
@@ -7851,5 +7905,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Direction to search for land"
-msgstr ""
+msgstr "Dirección para buscar por la tierra"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
@@ -7916,13 +7970,13 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Offset all points in East direction (degrees). Default 0."
-msgstr ""
+msgstr "Trasladar todos los puntos en dirección Este (por defecto 0 grados)."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in North direction (degrees). Default 0."
-msgstr ""
+msgstr "Trasladar todos los puntos en dirección Norte (por defecto 0 grados)."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Direction to search for land. Default east."
-msgstr ""
+msgstr "Búsqueda de dirección en la tierra (por defecto Este)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
@@ -8064,5 +8118,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:81
 msgid "Path Length"
-msgstr "Longitud del camino"
+msgstr "Longitud del recorrido"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:86
@@ -8106,5 +8160,5 @@
 msgstr "Bucle de descarga de OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Mostar cuestiones de OpenStreetBug"
@@ -8123,4 +8177,11 @@
 msgstr "Advertencia"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Ha ocurrido un error: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8150,35 +8211,38 @@
 "datos de OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Añadir un comentario"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Introduce tu comentario"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Marcar como hecho"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "¿Está seguro que quiere marcar esta cuestión como \"hecha\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "¿Está seguro que desea cerrar?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Nueva cuestión"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Crear cuestión"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Describa el problema con precisión"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Crear cuestión"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8207,5 +8271,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8215,9 +8279,9 @@
 "pestaña Configuraciones del Mapa del menú Preferencias."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "Opciones de osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Ejecutable Firefox"
@@ -8289,129 +8353,113 @@
 msgstr "El control remoto ha pedido importar datos de la siguiente URL:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Navegación"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr "Enrutamiento"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Ninguno"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "Clic para añadir nodos de ruta"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Clique para insertar nuevo un nodo."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "Clic y arrastrar param over los nodos de ruta"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Clique para insertar nuevo un nodo."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "Clic para añadir nodos de ruta"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "Abrir una lista de nodos de enrutamiento"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "Eliminando nodos duplicados..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Abrir una lista de todas las relaciones."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Estación"
+msgid "Add routing layer"
+msgstr "Añadir nueva capa"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "intermedia"
+msgstr "Criterios"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Zapatos"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "La más corta"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Rápido"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "La más rápida"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Invertir edificios adosados"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr "Ruta inversa"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Ruta de ferry"
+msgstr "Borrar ruta"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Preferencias del componente WMS"
+msgstr "Preferencias del componente Routing"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Configurar los sitios de complementos"
+msgstr "Configurar las preferencias de enrutamiento"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Salida de autopista"
+msgstr "Tipo de vial"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Velocidad max. (km/h)"
+msgstr "Velocidad (km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Altura"
+msgstr "Impedancia"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "Introduzca el peso de los valores"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Mapa desplazable"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Cargar tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Mostrar estado de la tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Solicitar actualización"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Cargar todas las teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Incrementar zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Reducir zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "la imagen no se carga"
@@ -8434,34 +8482,34 @@
 msgstr "Ajustes para el complmento SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Fuentes de teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Zoom automático: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Carga automática de teselas: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Max. nivel de zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Fondo de pantalla apagado: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "error al cargar los metadatos"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "solicitado:{0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "errore al solicitar actualización"
@@ -8476,5 +8524,5 @@
 msgstr "Grabar datos capturados cada minuto."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8514,5 +8562,5 @@
 #, java-format
 msgid "Could not read surveyor definition: {0}"
-msgstr ""
+msgstr "No se puede leer la definición de: {0}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
@@ -8531,7 +8579,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Editar estado/provincia"
+msgstr "Editar etiquetas"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8539,66 +8586,58 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Lanza la ventana de dialogo del editor de etiquetas"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "Componente JOSM Tag Editor"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "ninguno"
+msgstr "(ninguno)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "resaltar"
+msgstr "Resaltado"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "diversos"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr "<multiple>"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Cambiar las propiedades de hasta {0} objeto"
-msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] "Eliminar las claves antiguas de hasta {0} objecto"
+msgstr[1] "Eliminar las claves antiguas de hasta {0} objectos"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Cambiar las propiedades de hasta {0} objeto"
-msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
+msgstr[0] "Actualizar las propiedades de hasta {0} objeto"
+msgstr[1] "Actualizar las propiedades de hasta {0} objetos"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "ruta"
+msgstr "Agrupar"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Riachuelo"
+msgstr "Objeto"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Buscar"
+msgstr "Buscar: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Archivo"
+msgstr "Filtrar"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Coche"
+msgstr "Limpiar"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8657,5 +8696,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
 msgid "Select a single, closed way of at least four nodes."
-msgstr ""
+msgstr "Seleccione una vía cerrada de al menos cuatro puntos."
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
@@ -8686,5 +8725,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Nombre de la calle"
@@ -8784,24 +8823,21 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Nodo añadido en todas las intersecciones"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
+msgstr "Eliminar vías que no formen parte de un multipolígono interior"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relación"
+msgstr "Arreglar relaciones"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Unir áreas superpuestas"
+msgstr "Fusionar área superpuesta consigo misma"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Unir áreas superpuestas"
+msgstr "Fusionar áreas superpuestas"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8814,31 +8850,26 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Combinar conflictos"
+msgstr "Arreglar conflictos de etiquetas"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Borrar desde relación"
+msgstr "Eliminar elementos de las relaciones"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Fusionar áreas: eliminar las vías cortas"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Vías sin cerrar"
+msgstr "Vía cerrada"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Eliminar foto de la capa"
+msgstr "Eliminar etiquetas de vías internas"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Salida de autopista"
+msgstr "Función para la fusión de áreas"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -8879,4 +8910,5 @@
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
+"Imposible analizar la Longitud, Latitud y Zoom. Por favor, verifíquelo."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
@@ -9273,5 +9305,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Presets do not contain property key"
-msgstr ""
+msgstr "Los predefinidos no contienen la clave de propiedad"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
@@ -9295,4 +9327,6 @@
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
+"Validar que las propiedades de las claves son válidas analizando la lista de "
+"comprobación de las palabras."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
@@ -9448,4 +9482,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9527,7 +9567,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "edificio"
@@ -9541,5 +9581,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "área"
@@ -9858,4 +9898,9 @@
 msgstr "No es posible obtener un flujo de audio desde la URL"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9864,4 +9909,6 @@
 "import EXIF geotagged pictures."
 msgstr ""
+"Otro complemento de geoetiquetado para JOSM. Se relaciona las fotografías "
+"con la traza del GPS o importa los metadatos geográficos EXIF de las fotos."
 
 #. Plugin cadastre-fr
@@ -9869,4 +9916,6 @@
 msgid "A special handler for the french land registry WMS server."
 msgstr ""
+"Componente para utilizar el servidor WMS del registro de la propiedad del "
+"suelo francés."
 
 #. Plugin colorscheme
@@ -9879,10 +9928,14 @@
 "true :-)"
 msgstr ""
+"Permite al usuario crear diferentes esquemas de color e intercambiar entre "
+"ellos. Simplemente cambia los colores y crear un nuevo esquema. Se utiliza "
+"para cambiar a un fondo blanco con colores semejantes para una mejor "
+"visibilidad con la luz brillante del sol. Ver cuadro de diálogo en las "
+"preferencias de JOSM  y en \"Ajustes del Mapa\" (extraño pero cierto :-)"
 
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Crear áreas"
+msgstr "Crea una cuadrícula de viales"
 
 #. Plugin DirectUpload
@@ -9892,9 +9945,11 @@
 "openstreetmap.org."
 msgstr ""
+"Este componente sube directamente trazas GPS desde la capa activa en JOSM a "
+"openstreetmap.org."
 
 #. Plugin Duplicate-Way
 #: build/trans_plugins.java:13
 msgid "Duplicate Ways with an offset"
-msgstr ""
+msgstr "Duplicado de vías con cierto desplazamiento unas de otras"
 
 #. Plugin editgpx
@@ -9905,4 +9960,8 @@
 "eg. deleting uninteresting parts of track."
 msgstr ""
+"La principal característica del componente es la posibilidad de eliminar los "
+"puntos de una traza GPX. Se puede utilizar para preparar las trazas antes "
+"subirlas a OSM para, por ejemplo, suprimir partes de la traza poco "
+"interesantes."
 
 #. Plugin globalsat
@@ -9910,9 +9969,11 @@
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
+"Descargar puntos GPS desde el registrador de datos GlobalSat DG100 "
+"directamente en JOSM"
 
 #. Plugin grid
 #: build/trans_plugins.java:19
 msgid "Provide a background layer that displays a map grid"
-msgstr ""
+msgstr "Proporciona una capa de fondo que muestra una rejilla en el mapa"
 
 #. Plugin ImageWayPoint
@@ -9923,9 +9984,13 @@
 "the filename of an image."
 msgstr ""
+"Componente para hacer conincidir las fotografías con los puntos de interés "
+"recogidos en un archivo GPX. La correlación se produce cuando los atributos "
+"\"name\", \"cmt\" o \"desc\" de un punto coinciden con el nombre del archivo "
+"de una imagen."
 
 #. Plugin lakewalker
 #: build/trans_plugins.java:23
 msgid "Helps vectorizing WMS images."
-msgstr ""
+msgstr "Ayuda a vectorizar imágenes WMS"
 
 #. Plugin livegps
@@ -9934,4 +9999,6 @@
 "Support live GPS input (moving dot) through a connection to gpsd server."
 msgstr ""
+"Soporte GPS para dispositivos de entrada (punto en movimiento) a través de "
+"una conexión con un servidor DSGP."
 
 #. Plugin measurement
@@ -9942,4 +10009,7 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
+"Proporciona un panel con medidas y una capa para medir longitudes y ángulos "
+"de segmentos, el área que delimita una vía (simple)  cerrada y crea medidas "
+"de recorridos (los cuales pueden ser importados desde una capa GPS)."
 
 #. Plugin nearclick
@@ -9950,9 +10020,13 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
+"Simula un clic cuando haces un pequeño y corto arrastre del ratón. Esto es "
+"útil para punteros de tabletas digitalizadoras, cuando tengas problemas "
+"simplemente haz clic en la tableta digitalizadora sin mover el ratón(general "
+"Java - tablet problem).."
 
 #. Plugin openlayers
 #: build/trans_plugins.java:31
 msgid "Displays an OpenLayers background image"
-msgstr ""
+msgstr "Muestra una imágen OpenLayers de fondo"
 
 #. Plugin openstreetbugs
@@ -9960,4 +10034,6 @@
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
+"Importa de OpenStreetBugs posibles errores en los datos encontrados por "
+"usuarios de OSM"
 
 #. Plugin openvisible
@@ -9966,4 +10042,6 @@
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
+"Permite abrir archivos gpx/osm que intersectan con el área visible en la "
+"pantalla."
 
 #. Plugin osmarender
@@ -9972,39 +10050,52 @@
 "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
+"Lanza FireFox para mostrar la pantalla visible actual como una bonita imagen "
+"SVG."
+
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
-msgstr ""
+msgstr "El gran JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
-msgstr ""
+msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Proporciona capacidades de enrutamiento."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
 "background and request updates."
 msgstr ""
+"Muestra una rejilla del mapa desplazable en JOSM. Puede cargar teselas desde "
+"el mapa desplazable y solicitar actualizaciones."
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
-msgstr ""
+msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
+"Proporciona un cuadro de diálogo para la edición de etiquetas en una rejilla "
+"tabular."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -10012,41 +10103,55 @@
 "the jar-file as standalone as well."
 msgstr ""
+"Añade una etiqueta predefinida de prueba para el menú de ayuda que le ayuda "
+"a desarrollar el etiquetado de predefinidos (vista previa rápida de la "
+"ventana de diálogo que aparecerá). También puede iniciar el archivo jar de "
+"forma autónoma."
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
-msgstr ""
+msgstr "Carga directamente archivos TCX en JOSM"
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
-msgstr ""
+msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
 "user, opens browser showing selected author profile page."
 msgstr ""
+"Herramientas para trabajar con los autores/usuarios. Selecciona datos del "
+"mapa que pertenecen al usuario seleccionado y abre el navegador con la "
+"página del perfil de autor seleccionada."
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
 "jump to position."
 msgstr ""
+"Varias utilidades que hacen la vida más fácil: por ejemplo, simplificar un "
+"víal, unir áreas, moverse a un determinada posición, etc."
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
 "for the common ones. Spellcheck integrated for tag names."
 msgstr ""
+"Un validador de datos OSM. Verifica y avisa de los posibles errores "
+"existentes en los datos y proporciona correcciones para los comunes. Integra "
+"una corrector ortográfico para los nombres de las etiquetas."
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
 msgstr ""
+"Muestra imágenes georreferenciadas como fondo en JOSM (servidores WMS, "
+"Yahoo, etc.)"
 
 #. <!--
@@ -10133,5 +10238,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Referencia"
@@ -10186,7 +10291,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Capa"
@@ -10229,5 +10334,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Velocidad max. (km/h)"
@@ -10275,5 +10380,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Sentido único"
@@ -10329,5 +10434,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Puente"
@@ -10377,5 +10482,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Túnel"
@@ -10422,5 +10527,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Desmonte"
@@ -10467,5 +10572,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Terraplén"
@@ -10579,5 +10684,5 @@
 #: build/trans_presets.java:195 build/trans_surveyor.java:84
 msgid "Unclassified"
-msgstr "Carretera sin identificación propia"
+msgstr "Carretera sin denominación"
 
 #. item
@@ -10587,5 +10692,5 @@
 #: build/trans_presets.java:199
 msgid "Edit Unclassified Road"
-msgstr "Editar carretera sin identificación propia"
+msgstr "Editar carretera sin denominación"
 
 #. item "Streets/Unclassified" text "Max. speed (km/h)"
@@ -10623,6 +10728,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
@@ -10671,5 +10776,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Superficie"
@@ -10701,5 +10806,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "pavimentado"
@@ -10710,5 +10815,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "sin pavimentar"
@@ -10722,5 +10827,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "adoquinado"
@@ -10872,5 +10977,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10891,6 +10996,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "sí"
@@ -11034,7 +11139,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "no"
@@ -11048,73 +11153,63 @@
 msgstr "Vehículo de mercacías pesado (hgv)"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Caballo"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Moto"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Coche"
@@ -11189,130 +11284,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Tipo"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11320,5 +11303,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11326,11 +11309,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11338,5 +11315,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11344,5 +11321,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11350,5 +11327,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11356,6 +11333,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11374,6 +11357,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "Autopista"
@@ -11399,6 +11382,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "Carretera principal"
@@ -11424,6 +11407,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "vía primaria"
@@ -11449,6 +11432,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "vía secundaria"
@@ -11462,5 +11445,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "carretera local"
@@ -11468,5 +11451,5 @@
 #: build/trans_presets.java:334
 msgid "unclassified"
-msgstr "carretera sin clasificación"
+msgstr "carretera sin denominación"
 
 #. color green
@@ -11478,5 +11461,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "calle urbana"
@@ -11494,5 +11477,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "vía de servicio"
@@ -11519,6 +11502,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "en construcción"
@@ -11559,6 +11542,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11569,5 +11551,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "rotonda"
@@ -11912,14 +11894,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Operador"
@@ -11944,20 +11926,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "sin supervisión"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "señales de tráfico"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "isla"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "sin marcar"
@@ -11965,5 +11947,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "Cruce de caballos"
@@ -11972,5 +11954,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "Cruce de bicicletas"
@@ -11980,5 +11962,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
@@ -12127,10 +12109,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Altitud"
@@ -12143,29 +12126,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Escalera de paso"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Editar una escalera de paso"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Bolardo"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Editar un bolardo"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12174,7 +12146,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12183,235 +12158,223 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Tráfico permitido:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr "Barrera para bicicletas"
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Bloques"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Barrera canadiense"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Editar barrera canadiense"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "Trampa para coches"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr "Pinchos"
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr "Editar pinchos"
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Cabina de peaje"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Editar cabina de peaje"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Aduana"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Editar aduana"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Seto"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Valla o cerca"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Muro"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Muralla"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Muro de contención"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Entrada"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Editar una entrada"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "Puerta"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "Editar puerta"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "Barrera"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "Editar una barrera"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Portilla de malla metálica"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Editar portilla de malla metálica"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Banda reductora de velocidad"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Editar banda reductora de velocidad"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "Portilla giratoria"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
 msgstr "Editar portilla giratoria"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Portilla de malla metálica"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Editar portilla de malla metálica"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Bolardo"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Editar un bolardo"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Puente levadizo"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Editar un puente levadizo"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "Trampa para coches"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Barrera canadiense"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Editar barrera canadiense"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr "Pinchos"
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr "Editar pinchos"
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Rastrillo"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Editar rastrillo"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "Puerta"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "Editar puerta"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr "Barrera"
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr "Editar una barrera"
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Escalera de paso"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Editar una escalera de paso"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Poterna"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Editar poterna"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Banda reductora de velocidad"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Editar banda reductora de velocidad"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr "Barrera para bicicletas"
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Seto"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Valla o cerca"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Bloques"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Muro"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Muralla"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Muro de contención"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Cabina de peaje"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Editar cabina de peaje"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Aduana"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Editar aduana"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Entrada"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Editar una entrada"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Lámina de agua"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Fuente"
@@ -12419,5 +12382,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Editar fuente"
@@ -12425,5 +12388,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Desagüe"
@@ -12431,10 +12394,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Editar canal de desagüe"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Riachuelo"
@@ -12442,10 +12405,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "editar un riachuelo"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Canal"
@@ -12453,10 +12416,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Editar un canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Río"
@@ -12466,5 +12429,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Editar un río"
@@ -12472,15 +12435,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Editar lámina de agua"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Suelo"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Editar suelo"
@@ -12488,15 +12451,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Cuenca"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Editar cuenca"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Embalse"
@@ -12504,15 +12467,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Editar embalse"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Depósito de agua"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Editar depósito de agua"
@@ -12520,5 +12483,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Ribera"
@@ -12527,10 +12490,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Editar ribera"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Pantano"
@@ -12541,56 +12504,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Editar pantano"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "Ciénaga"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "ciénaga"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "marísma"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "juncal"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "saladar"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "superficie mareal"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "manglar"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Lodazal"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Editar lodazal"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Playa"
@@ -12598,20 +12561,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Editar playa"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Bahía"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Editar bahía"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Acantilado"
@@ -12619,10 +12582,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Editar acantilado"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Línea de costa"
@@ -12630,5 +12593,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Editar línea de costa"
@@ -12636,5 +12599,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Ruta de ferry"
@@ -12642,5 +12605,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Editar una ruta de ferry"
@@ -12649,5 +12612,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Astillero"
@@ -12655,10 +12618,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Editar un astillero"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Muelle"
@@ -12666,5 +12629,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Editar un muelle"
@@ -12672,5 +12635,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Presa"
@@ -12678,15 +12641,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Editar una presa"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Nodo de vía acuática"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Esclusa"
@@ -12695,5 +12658,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Represa"
@@ -12701,20 +12664,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Editar una represa"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Cascada"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Editar una cascada"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Ensanche para giro"
@@ -12723,15 +12686,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Puerto deportivo"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Editar puerto deportivo"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Embarcadero"
@@ -12739,10 +12702,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Editar embarcadero"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Terminal de ferry"
@@ -12750,10 +12713,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Editar la terminal de ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Rampa"
@@ -12763,5 +12726,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Editar rampa"
@@ -12769,10 +12732,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Ferrocarril"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Vía de tren"
@@ -12780,5 +12743,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Ediar vía de tren"
@@ -12808,8 +12771,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Tipos opcionales"
@@ -12823,35 +12786,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "yarda"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "vía muerta"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "ramal"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Vía estrecha"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Editar vía estrecha"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Monoraíl"
@@ -12859,45 +12822,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Editar monoraíl"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Vía para tren histórico"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Editar vía para tren histórico"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Metro ligero"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Editar metro ligero"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Editar metro"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Tranvía"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Editar tranvía"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Vía para autobús guiado"
@@ -12905,5 +12868,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Editar vía para autobús guiado"
@@ -12912,14 +12875,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Vía de tren en desuso"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Editar vía de tren en desuso"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Vía de tren abandonada"
@@ -12928,5 +12891,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Paso a nivel"
@@ -12935,5 +12898,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Paso a nivel peatonal"
@@ -12943,5 +12906,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr "Tipo de paso"
@@ -12949,5 +12912,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Plataforma de giro"
@@ -12956,10 +12919,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Remonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Telesilla"
@@ -12967,10 +12930,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Editar telesilla"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Telearrastre"
@@ -12978,10 +12941,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Editar telearrastre"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Telecabina"
@@ -12989,24 +12952,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Ediatr telecabina"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Editar golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Estación"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Editar Estación"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Gasolinera"
@@ -13016,5 +12992,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Ediatr gasolinera"
@@ -13030,5 +13006,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -13038,5 +13014,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Editar aparcamiento"
@@ -13044,40 +13020,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Capacidad (Coches)"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "al aire libre"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "de pisos"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "subterráneo"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "estacionamientos Park and Ride"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Plazas para Personas de Movilidad Reducida"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "De pago"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Limpieza"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Editar lavado de vehículos"
@@ -13085,5 +13062,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Concesionario"
@@ -13091,15 +13068,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Taller"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Editar reparación de automóviles"
@@ -13107,5 +13084,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Alquiler"
@@ -13114,10 +13091,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Editar alquiler de automóviles"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Compartido"
@@ -13125,5 +13102,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Editar automóviles compartidos"
@@ -13131,5 +13108,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Editar aparcamiento para bicicletas"
@@ -13138,5 +13115,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Editar alquiler de bicicletas"
@@ -13145,15 +13122,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Editar tienda de bicicletas"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Transporte público"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Referencia"
@@ -13161,5 +13138,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Apeadero de ferrocarril"
@@ -13167,5 +13144,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Editar apeadero"
@@ -13173,5 +13150,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Parada de tranvía"
@@ -13180,5 +13157,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Editar parada de tranvía"
@@ -13186,5 +13163,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Andén de ferrocarril"
@@ -13193,5 +13170,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Editar andén de ferrocarril"
@@ -13203,5 +13180,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "Referencia (número de pista)"
@@ -13209,10 +13186,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Boca de metro"
@@ -13221,10 +13198,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Editar boca de metro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Silla de ruedas"
@@ -13233,5 +13210,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Estación de autobús"
@@ -13240,5 +13217,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Editar estación de autobús"
@@ -13246,5 +13223,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Parada de autobús"
@@ -13254,5 +13231,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Editar parada de autobús"
@@ -13260,10 +13237,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Andén de autobús"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Editar andén de autobús"
@@ -13271,5 +13248,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13277,5 +13254,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Editar parada de taxi"
@@ -13283,5 +13260,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Aeropuerto"
@@ -13289,15 +13266,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Editar Aeropuerto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13306,5 +13283,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Alojamiento"
@@ -13316,5 +13293,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -13323,15 +13300,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Editar hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Estrellas"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motel"
@@ -13339,20 +13316,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Editar motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Chalet"
@@ -13360,10 +13337,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Editar chalet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Albergue"
@@ -13371,30 +13348,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -13402,10 +13379,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -13416,5 +13393,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -13422,5 +13399,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
@@ -13428,5 +13405,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Cocina"
@@ -13434,61 +13411,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -13496,9 +13473,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Cafetería"
@@ -13506,10 +13483,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Bar"
@@ -13517,20 +13494,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Editar bar"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "Bar"
@@ -13538,10 +13515,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -13549,20 +13526,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Editar club nocturno"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Editar atracción"
@@ -13571,11 +13548,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Horario de apertura"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "Museo"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "Editar museo"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "Zoo"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "Editar zoo"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "Panorámica"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "Editar panorámica"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Torre de vigía"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "Parque temático"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "Editar parque temático"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "Trabajo artístico"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "Editar trabajo artístico"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "Oficina de información"
@@ -13583,143 +13621,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
 msgstr "Editar oficina de información"
 
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "Museo"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "Editar museo"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "Zoo"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "Editar zoo"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "Panorámica"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "Editar panorámica"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Torre de vigía"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "Parque temático"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "Editar parque temático"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "Trabajo artístico"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "Editar trabajo artístico"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
-msgstr "Hito (Excursionismo)"
-
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr "Tipo de Mapa"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "callejero"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "topoguía"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "mapa ciclable"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
-msgstr ""
+msgstr "Descripción detallada"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr "Tipo de Cartel"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr "cartel"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr "vida salvaje"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr "Hito direccional (excursionismo)"
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Refugio"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Editar refugio"
@@ -13727,25 +13705,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Barbacoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Castillo"
@@ -13754,20 +13732,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -13776,20 +13754,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueológico"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Campo de batalla"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Editar campo de batalla"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -13797,56 +13787,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Campo de batalla"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Editar campo de batalla"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -13854,15 +13833,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Editando pesca"
@@ -13870,15 +13849,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -13892,6 +13871,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -13970,4 +13949,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14259,28 +14246,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "deporte"
@@ -14290,227 +14278,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "fútbol"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Campo de juego"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Editar campo de juego"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -14549,191 +14537,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "campo de juego"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Ciclismo"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Natación"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Editar natación"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Esquí"
@@ -14741,56 +14729,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "intermedia"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "Tiro"
@@ -14798,178 +14788,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Fútbol americano"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Editar fútbol americano"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Editar rugby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Edificios"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Edificio"
@@ -14977,5 +14967,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Edificio público"
@@ -14983,10 +14973,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -14994,10 +14984,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Embajada"
@@ -15005,10 +14995,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -15017,10 +15007,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Prisión"
@@ -15029,10 +15019,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Policía"
@@ -15042,10 +15032,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -15054,10 +15044,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -15065,5 +15055,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -15071,15 +15061,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Escuela"
@@ -15087,10 +15077,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Universidad"
@@ -15098,10 +15088,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -15109,5 +15099,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -15115,5 +15105,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Cine"
@@ -15122,10 +15112,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Biblioteca"
@@ -15134,10 +15124,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -15145,10 +15135,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Teatro"
@@ -15157,10 +15147,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -15170,5 +15160,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -15177,6 +15167,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Religión"
@@ -15185,66 +15175,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "unitarianista"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Confesión"
@@ -15253,81 +15244,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Direcciones"
@@ -15336,5 +15327,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -15342,5 +15333,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Número de portal"
@@ -15348,20 +15339,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Código del país"
@@ -15369,5 +15360,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Direcciones interpoladas"
@@ -15376,5 +15367,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Editar direcciones interpoladas"
@@ -15382,67 +15373,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "todos"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "atletismo"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Fábrica"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Faro"
@@ -15450,10 +15446,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -15461,10 +15457,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Tubería"
@@ -15472,10 +15468,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -15485,10 +15481,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Grúa"
@@ -15496,10 +15492,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Editar grúa"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Baliza"
@@ -15507,10 +15503,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -15518,10 +15514,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -15529,5 +15525,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
@@ -15535,5 +15531,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -15543,39 +15539,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -15584,10 +15580,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -15596,5 +15592,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -15602,10 +15598,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -15616,5 +15612,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
@@ -15622,5 +15618,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -15629,25 +15625,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Voltaje"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Número de cables"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Baños"
@@ -15655,25 +15651,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Número de referencia"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Pago"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Teléfono"
@@ -15682,5 +15673,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -15688,5 +15679,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Monedas"
@@ -15694,5 +15685,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Billetes"
@@ -15700,5 +15691,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -15706,5 +15697,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -15712,15 +15703,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -15729,5 +15720,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -15735,35 +15726,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Banco"
@@ -15772,20 +15763,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Oculto"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Esclusa"
@@ -15793,22 +15784,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Fuente"
@@ -15817,10 +15808,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -15829,10 +15820,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -15840,25 +15831,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Tiendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -15866,10 +15857,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kiosko"
@@ -15877,10 +15868,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Editar kiosko"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -15888,5 +15879,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -15894,88 +15885,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 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:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Carnicería"
@@ -15983,10 +15974,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Panadería"
@@ -15994,10 +15985,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Floristería"
@@ -16005,70 +15996,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Escuela"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Editar zapatería"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Computador"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de computadores"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Editar Tienda Hifi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -16076,10 +16081,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "Hardware"
@@ -16087,10 +16092,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "Editar almacén de hardware"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -16098,60 +16103,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -16159,10 +16164,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Lavandería"
@@ -16170,10 +16175,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -16181,35 +16186,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "Deportes"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Deporte"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "Óptica"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Banco"
@@ -16217,5 +16224,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Editar banco"
@@ -16223,10 +16230,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -16234,5 +16241,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -16240,15 +16247,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Médico"
@@ -16256,20 +16263,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Editar médico"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -16277,5 +16284,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -16283,10 +16290,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Hospital"
@@ -16294,10 +16301,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -16306,5 +16313,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -16313,20 +16320,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -16334,5 +16341,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -16341,25 +16348,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "País"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Editar país"
@@ -16367,45 +16374,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Región"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Municipio"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Editar municipio"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -16413,10 +16421,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr ""
@@ -16426,5 +16434,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr ""
@@ -16433,15 +16441,15 @@
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr ""
@@ -16449,5 +16457,5 @@
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr ""
@@ -16456,5 +16464,6 @@
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Paraje"
@@ -16462,10 +16471,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Isla"
@@ -16473,5 +16482,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Editar isla"
@@ -16479,5 +16488,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -16485,10 +16494,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Pico"
@@ -16496,10 +16505,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Glaciar"
@@ -16507,10 +16516,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Volcán"
@@ -16518,70 +16527,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Nacional"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2722
+msgstr "Político"
+
+#. item
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2728
+msgstr "Parque Nacional"
+
+#. item
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Árbol"
@@ -16590,15 +16599,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Bosque"
@@ -16607,5 +16616,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -16613,17 +16622,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Gran area bosque"
@@ -16632,19 +16641,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Pedregal"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Editar pedregal"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Matorral"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Editar matorral"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Braña"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Editar braña"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Brezal"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Editar brezal"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Corral"
@@ -16653,70 +16706,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Editar corral"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "Prado"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Jardín"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "Parque municipal"
@@ -16724,10 +16778,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Espacio de uso común"
@@ -16735,20 +16789,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Parque"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -16756,5 +16810,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -16762,15 +16816,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Cementario"
@@ -16778,9 +16832,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -16788,39 +16842,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Comercios"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -16828,114 +16882,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Militar"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Editar área militar"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Zona en construcción"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Editar zona en construcción"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Zona en construcción"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Editar zona en construcción"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Militar"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Editar área militar"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Pedregal"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Editar pedregal"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Matorral"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Editar matorral"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Braña"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Editar braña"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Brezal"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Editar brezal"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -16945,5 +16956,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -16952,10 +16963,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "segmento interior"
@@ -16963,5 +16974,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -16970,5 +16981,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -16976,34 +16987,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "solo recto"
@@ -17012,15 +17023,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 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:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "a la vía"
@@ -17028,5 +17039,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Ruta"
@@ -17035,11 +17046,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
-msgstr "Editar una ruta"
+msgstr "Editar ruta"
 
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -17111,24 +17122,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "bicicleta"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "ski"
@@ -17173,4 +17184,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17180,19 +17194,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "pie"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "senderismo"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "desvío"
@@ -17206,10 +17221,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -17217,26 +17232,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -17245,30 +17260,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -17452,4 +17467,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17461,4 +17583,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17560,11 +17691,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "obsoleto"
@@ -17606,7 +17739,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "caballo"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Barreras"
 
 #. color tertiary
@@ -17642,6 +17990,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "calle"
@@ -17697,9 +18045,9 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
-msgstr ""
+msgstr "pista"
 
 #. color foot
@@ -17744,108 +18092,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "ferrocarril"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viaducto"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17862,4 +18123,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "vía de servicio"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17869,4 +18136,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Vado"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17883,8 +18156,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "círculo de giro"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "Punto de acceso para emergencias"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17896,5 +18183,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "ribera"
@@ -17908,5 +18195,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "arroyo"
@@ -17920,5 +18207,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "muelle"
@@ -17946,5 +18233,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "acueducto"
@@ -17959,4 +18246,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17996,5 +18284,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18111,12 +18399,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "hecho por el hombre"
@@ -18162,5 +18451,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18178,9 +18467,9 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
-msgstr ""
+msgstr "punto ferroviario"
 
 #. color rail
@@ -18201,10 +18490,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr "otros ferrocarriles"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr "paso con más de un cruce ferroviario"
@@ -18234,6 +18523,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr "vía muerta"
@@ -18278,6 +18567,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "aerovía"
@@ -18291,5 +18580,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminal"
@@ -18311,7 +18600,7 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
-msgstr ""
+msgstr "pista (oscuro)"
 
 #. color aeroway
@@ -18323,7 +18612,7 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
-msgstr ""
+msgstr "pista (claro)"
 
 #. color aeroway_light
@@ -18344,4 +18633,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18361,4 +18658,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "pista de rodadura"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18367,23 +18670,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "pista de rodadura"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "pista fácil"
@@ -18397,5 +18687,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "pista intermedia"
@@ -18409,5 +18700,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "pista avanzada"
@@ -18420,6 +18712,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "pista de estilo libre"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "pista de estilo libre"
@@ -18433,5 +18740,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "pista para iniciados"
@@ -18462,4 +18770,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18494,4 +18810,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18504,8 +18844,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "energía"
@@ -18518,5 +18860,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "muelle"
@@ -18530,5 +18875,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "tubería"
@@ -18656,12 +19001,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "ocio"
@@ -18675,5 +19020,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "puerto deportivo"
@@ -18745,8 +19090,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "servicios"
@@ -18782,4 +19127,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18839,11 +19192,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "tráfico de ocio"
@@ -18982,6 +19335,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19208,24 +19582,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
-msgstr ""
+msgstr "equipamiento lumínico"
 
 #. color amenity_light
@@ -19255,8 +19629,8 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
-msgstr ""
+msgstr "agua (claro)"
 
 #. color amenity_light
@@ -19290,4 +19664,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19307,7 +19689,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "salud"
@@ -19401,4 +19784,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19601,4 +19992,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19632,28 +20039,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "tienda"
@@ -19707,4 +20116,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19717,8 +20134,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotel"
@@ -19773,4 +20190,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19867,9 +20285,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "turismo"
@@ -19941,8 +20359,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -20012,9 +20430,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "zona verde"
@@ -20028,5 +20446,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "cantera"
@@ -20040,5 +20458,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "vertedero"
@@ -20060,5 +20478,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "cuenca"
@@ -20072,5 +20490,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "gran area bosque"
@@ -20084,5 +20502,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "corral"
@@ -20105,5 +20523,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "venta al por menor"
@@ -20117,5 +20535,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "industrial"
@@ -20129,5 +20547,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -20141,5 +20559,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "área rururbana"
@@ -20153,5 +20571,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -20208,7 +20626,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "zona militar"
@@ -20222,5 +20640,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "cementerio"
@@ -20233,5 +20651,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "pico"
@@ -20246,5 +20664,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "glaciar"
@@ -20258,5 +20676,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "volcán"
@@ -20271,4 +20689,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20310,7 +20729,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "espacio natural"
@@ -20324,5 +20744,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "matorral"
@@ -20336,5 +20756,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "monte"
@@ -20348,5 +20768,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "bosque"
@@ -20360,5 +20780,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "lodazal"
@@ -20372,5 +20792,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "playa"
@@ -20448,8 +20868,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "ruta"
@@ -20497,7 +20917,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "frontera"
@@ -20639,10 +21059,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "lugar"
@@ -20683,6 +21103,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "dirección"
@@ -20962,321 +21389,53 @@
 #: build/trans_wms.java:20
 msgid "Streets NRW Geofabrik.de"
-msgstr "Calles NRW Geofabrik.de"
-
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "Si su aparato gps dibujó líneas de menos, seleccione esto para dibujar "
-#~ "líneas a lo largo de la vía"
-
-#~ msgid "Navigate"
-#~ msgstr "Navegar"
-
-#~ msgid "Navigator"
-#~ msgstr "Navegador"
-
-#~ msgid "Set start/end for routing. Middle mouse button to reset."
-#~ msgstr ""
-#~ "Establecer punto de salida y de llegada para enrutamiento. Usar el botón "
-#~ "central del ratón para reiniciar."
-
-#~ msgid "Reset Graph"
-#~ msgstr "Restaurar gráfico"
-
-#~ msgid "Error while exporting {0}"
-#~ msgstr "Error mientras se exportaba {0}"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Por favor, selecciona algo de la lista de conflictos."
-
-#~ msgid "Please select a color."
-#~ msgstr "Por favor, selecciona un color."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "No inicie el modo pantalla completa"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Noticias sobre JOSM"
-
-#~ msgid "OSM History Information"
-#~ msgstr "Información histórica OSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Clique el nodo existente para crear un anueva vía."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Clique para crear una conexión al nodo existente"
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Clique para insertar un nodo y crear una nueva vía."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Clique para insertar nuevo un nodo y crear una conexión."
-
-#~ msgid "Search ..."
-#~ msgstr "Buscar..."
-
-#~ msgid " ({0} node)"
-#~ msgid_plural " ({0} nodes)"
-#~ msgstr[0] " (nodo {0})"
-#~ msgstr[1] " (nodos {0})"
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr ""
-#~ "Por favor, seleccione los objetos para los que quiere cambiar las "
-#~ "propiedades."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "Este editor básico de relaciones le permite cambiar tanto etiquetas de "
-#~ "relación como miembros. Además de esto deberíamos tener un editor que "
-#~ "detecte el tipo de relación y limite sus opciones en consecuencia."
-
-#~ msgid "Highlight the member from the current table row as JOSM's selection"
-#~ msgstr ""
-#~ "Resaltar el miembro de la fila de tabla actual como una selección de JOSM"
-
-#~ msgid "Selection: %d way(s) and %d node(s)"
-#~ msgstr "Selección: %d vía(s) y %d nodo(s)"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Subir esta traza..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Esta funcionalidad se ha añadido hace poco. Por favor<br>úsela con "
-#~ "precaución y verifique si funciona como esperaba.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Subir traza filtrada por JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Subir archivo en crudo: "
-
-#~ msgid "Description:"
-#~ msgstr "Descripción:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Etiquetas (palabras clave en gpx)"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "Subir-GPX"
-
-#~ msgid "time"
-#~ msgstr "tiempo"
-
-#~ msgid "desc"
-#~ msgstr "desc"
-
-#~ msgid "symbol"
-#~ msgstr "símbolo"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Subir archivo en crudo: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Etiquetas:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "Elija el tono del color de la traza por velocidad en ese punto"
-
-#~ msgid "Unknown type"
-#~ msgstr "Tipo desconocido"
-
-#~ msgid "NullPointerException, Possibly some missing tags."
-#~ msgstr "NullPointerException, Posiblemente faltan algunas etiquetas."
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Subiendo {0} {1} (id: {2}) {3}% {4}/{5} (quedan {6})..."
-
-#~ msgid ""
-#~ "<html>Please report a ticket at {0}<br>Include your steps to get to the "
-#~ "error (as detailed as possible)!<br>Be sure to include the following "
-#~ "information:</html>"
-#~ msgstr ""
-#~ "<html>Por favor, informe del problema en {0}<br>Incluya los pasos "
-#~ "realizados hasta obtener el error (tan detallados como sea posible)"
-#~ "<br>Asegúrese de incluir la siguiente información:</html>"
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Editar una salida"
-
-#~ msgid "Exit Number"
-#~ msgstr "Número de la salida"
-
-#~ msgid "Exit Name"
-#~ msgstr "Nombre de la salida"
-
-#~ msgid "Waterway"
-#~ msgstr "Vía acuática"
-
-#~ msgid "Information point"
-#~ msgstr "Punto de información"
-
-#~ msgid "Provider"
-#~ msgstr "Proveedor"
-
-#~ msgid "political"
-#~ msgstr "Política"
-
-#~ msgid "National_park"
-#~ msgstr "Parque nacional"
-
-#~ msgid "Natural"
-#~ msgstr "Natural"
-
-#~ msgid "Add Site"
-#~ msgstr "Añadir sitio"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Eliminar sitio(s)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Por favor, seleccione un sitio para eliminar"
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Comprobar sitio(s)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Por favor, seleccione el sitio(s) para comprobar actualizaciones"
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Añadir un nuevo sitio de componentes"
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Eliminar el sitio(s) seleccionado de la lista."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr ""
-#~ "Revisar el sitio(s) seleccionado para los nuevos componentes o "
-#~ "actualizaciones."
-
-#~ msgid "Update Sites"
-#~ msgstr "Actualizar sitios"
-
-#~ msgid "Version"
-#~ msgstr "Versión"
-
-#~ msgid "Install"
-#~ msgstr "Instalar"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Version: {0}<br>último cambio {1}"
-
-#~ msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-#~ msgstr "El componente SurveyorPlugin depende del componente LiveGpsPlugin!"
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr "Componente LiveGps no encontrado. Por favor, instálelo y actívalo"
-
-#~ msgid "SurveyorPlugin is disabled for the moment"
-#~ msgstr "El Componente Surveyor está desactivado por el momento"
-
-#~ msgid "SurveyorPlugin"
-#~ msgstr "Componente Surveyor"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Versión {0} - Último cambio el {1}"
-
-#~ msgid "Duplicated nodes."
-#~ msgstr "Nodos duplicados."
-
-#~ msgid "Similar named ways."
-#~ msgstr "Vías con nombres iguales."
-
-#~ msgid "Open waypoints file"
-#~ msgstr "Abrir archivo de nodos de vía"
-
-#~ msgid "Open a waypoints file."
-#~ msgstr "Abrir un archivo de waypoints."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "Error en los datos: el valor lat \"{0} esta fuera del límite"
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "Error en los datos: el valor lon \"{0} esta fuera del límite"
-
-#~ msgid "Development version. Unknown revision."
-#~ msgstr "Versión de desarrolo. Revisión desconocida."
-
-#~ msgid ""
-#~ "<html>Fulltext search:<ul><li><b>Baker Street</b> - 'Baker' and 'Street' "
-#~ "in any key or name.</li><li><b>\"Baker Street\"</b> - 'Baker Street' in "
-#~ "any key or name.</li><li><b>name:Bak</b> - 'Bak' anywhere in the name.</"
-#~ "li><li><b>-name:Bak</b> - not 'Bak' in the name.</li><li><b>foot:</b> - "
-#~ "key=foot set to any value.</li><li>Special targets:</li><li><b>type:</b> "
-#~ "- type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)</"
-#~ "li><li><b>user:</b>... - all objects changed by user</li><li><b>id:</"
-#~ "b>... - object with given ID</li><li><b>nodes:</b>... - object with given "
-#~ "number of nodes</li><li><b>modified</b> - all changed objects</"
-#~ "li><li><b>selected</b> - all selected objects</li><li><b>incomplete</b> - "
-#~ "all incomplete objects</li><li>Use <b>|</b> or <b>OR</b> to combine with "
-#~ "logical or</li><li>Use <b>\"</b> to quote operators (e.g. if key "
-#~ "contains :)</li><li>Use <b>(</b> and <b>)</b> to group expressions</li></"
-#~ "ul></html>"
-#~ msgstr ""
-#~ "<html>Buscar texto completo:<ul><li><b>Calle Mayor</b> - 'Calle' y "
-#~ "'Mayor' en cualquier etiqueta o nombre.</li><li><b>\"Calle Mayor\"</b> - "
-#~ "'Calle Mayor' en cualquier etiqueta o nombre.</li><li><b>name:May</b> - "
-#~ "'May' en cualquier parte del nombre.</li><li><b>-name:May</b> - sin 'May' "
-#~ "en el nombre.</li><li><b>foot:</b> - key=foot existente en cualquier "
-#~ "valor.</li><li>Búsquedas especiales:</li><li><b>type:</b> - tipología de "
-#~ "objeto (<b></b>, <b>way</b>, <b>relation</b>)</li><li><b>user:</b>... - "
-#~ "todos los objetos modificados por un usuario</li><li><b>id:</b>... - "
-#~ "objeto con el identificador dado</li><li><b>nodes:</b>... - objeto con un "
-#~ "número dado de nodos</li><li><b>modified</b> - todos los objetos que han "
-#~ "sido modificados</li><li><b>selected</b> - todos los objetos "
-#~ "seleccionados</li><li><b>incomplete</b> - todos los objetos incompletos</"
-#~ "li><li>Usar <b>|</b> o <b>OR</b> para combinar con operadores lógicos o</"
-#~ "li><li>Usar <b>\"</b> para operadores comillas (por ejemplo si contiene :)"
-#~ "</li><li>Usar <b>(</b> y <b>)</b> para agrupar expresiones</li></ul></"
-#~ "html>"
-
-#~ msgid "Add Node"
-#~ msgstr "Añadir nodo"
-
-#~ msgid "Signpost"
-#~ msgstr "Señal vertical"
-
-#~ msgid "office"
-#~ msgstr "oficina"
-
-#~ msgid "guidepost"
-#~ msgstr "poste indicador"
-
-#~ msgid "NoName"
-#~ msgstr "Sin nombre"
-
-#~ msgid "Ref"
-#~ msgstr "Ref."
-
-#~ msgid "Update Site URL"
-#~ msgstr "URL base del servidor"
-
-#~ msgid "Invalid URL"
-#~ msgstr "URL no válida"
-
-#~ msgid "unusual named way type"
-#~ msgstr "nombre de tipo de via poco común"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Descargar \"Mensaje del día\""
-
-#~ msgid "Open map features in browser"
-#~ msgstr "Abrir características del mapa en el navegador"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "¿Cuántos edificios hay adosados?"
-
-#~ msgid "Update available"
-#~ msgstr "Actualización disponible"
-
-#~ msgid "Version Details:"
-#~ msgstr "Detalles de la versión:"
+msgstr "Calles NRW Geofabrik.de de Renania del Norte-Westfalia"
+
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Abrir..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Descripción"
+
+#~ msgid "Commit comment"
+#~ msgstr "Envíe comentario"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "El servidor no soporta conjuntos de cambios"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Transferencia abortada debido a un error (se esperará 5 segundos):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "¿Está seguro que quiere marcar esta cuestión como \"hecha\"?"
+
+#~ msgid "Navigation"
+#~ msgstr "Navegación"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "Eliminar nodos de ruta"
+
+#~ msgid "Start routing"
+#~ msgstr "Iniciar enrutamiento"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Puente levadizo"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Editar un puente levadizo"
+
+#~ msgid "Portcullis"
+#~ msgstr "Rastrillo"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Editar rastrillo"
+
+#~ msgid "Charge"
+#~ msgstr "Pago"
+
+#~ msgid "sports"
+#~ msgstr "Deportes"
+
+#~ msgid "viaduct"
+#~ msgstr "viaducto"
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 14844)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-30 02:08+0000\n"
-"Last-Translator: Teemu Koskinen <Unknown>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-24 08:11+0000\n"
+"Last-Translator: Lauri Kytömaa <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:54+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Luodaan pääikkuna"
@@ -38,38 +38,38 @@
 "EPSG:4326."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Vihje: Osa muutoksista tuli lähetettäessä uutta dataa palvelimelle."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Tallentamattomia muutoksia"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Tallentamattomia muutoksia. Hylätäänkö muutokset?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Tallenna ja poistu"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Poistu tallentamatta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -80,10 +80,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -94,4 +94,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -101,10 +102,10 @@
 msgstr "Peruuta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -130,8 +131,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -272,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -407,6 +408,6 @@
 msgstr "Käännä ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -414,20 +415,20 @@
 msgstr "Syötä arvot kaikille ristiriidoille."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Ratkaise ristiriitoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Yhdistä {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Kaikki polut olivat tyhjiä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -507,5 +508,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124
 msgid "Distribute Nodes"
-msgstr ""
+msgstr "Kohdista pisteet tasavälein viivalle"
 
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
@@ -528,5 +529,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -647,6 +648,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -655,6 +656,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -781,9 +782,9 @@
 msgstr "Yhdistä silti"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 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:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1059,5 +1060,5 @@
 msgstr "Tallenna tämänhetkinen data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1067,26 +1068,26 @@
 "tasoja. Ole hyvä ja ilmoita tämä ohjelmistovirheenä."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Ei mitään tallennettavaa: ei avoimia tiedostoja."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Tyhjä dokumentti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Dokumentti ei sisällä tietoa"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Tallenna silti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Ristiriidat"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1096,32 +1097,32 @@
 "ristiriidoista. Jatka tallennusta?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Hylkää ristiriidat ja tallenna"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Tallenna GPX-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Tallenna OSM-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Tiedostoa ei voitu varmuuskopioida."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Tuntematon tiedostopääte."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Tallennettaessa tapahtui virhe."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Varmuuskopion palauttamisessa tapahtui virhe."
@@ -1177,18 +1178,18 @@
 msgstr "Sulje"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Katkaise polku"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Katkaisee polun valitun pisteen kohdalta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Valintaa ei voida käyttää jakamiseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1196,5 +1197,5 @@
 msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1210,9 +1211,9 @@
 "valitse myös polku jonka haluat katkaista."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "Valitut pisteet eivät ole samalla polulla."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1220,10 +1221,10 @@
 msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1233,5 +1234,5 @@
 "pisteitä, jotka eivät ole polun päissä.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1242,5 +1243,5 @@
 "korjaa tarvittaessa."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1380,5 +1381,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
 msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr ""
+msgstr "Lataa nykyisten karttatietojen uusimmat versiot palvelimelta."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:71
@@ -1386,4 +1387,5 @@
 "No data to update found. Have you already opened or downloaded a data layer?"
 msgstr ""
+"Ei päivitettäviä karttatietoja. Et ole ladannut etkä avannut karttatietoja."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
@@ -1394,47 +1396,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Lähetä OSM-palvelimelle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Lähetä kaikki muutokset OSM-palvelimelle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Lisättävät objektit:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Muokattavat objektit:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Poistettavat objektit:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Lähetetäänkö nämä muutokset?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Lähetä muutokset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Ei mitään lähetettävää. Hae ensin dataa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr ""
 "Selvittämättömiä ristiriitoja. Ne tulee selvittää ennen muutosten lähetystä."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Ei lähetettäviä muutoksia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Lähetetään dataa"
@@ -1620,31 +1626,33 @@
 msgstr "Maailman ulkopuolelle ei voi lisätä pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Lisää piste"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Lisää piste polkuun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Yhdistä olemassa oleva polku pisteeseen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Lisää uusi piste olemassa olevaan polkuun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Lisää piste polkuun ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Luo uusi piste."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Valitse kursorin alla oleva piste."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1653,9 +1661,4 @@
 msgstr[0] "Lisää uusi piste polkuun."
 msgstr[1] "Lisää uusi piste {0} polkuun."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Valitse kursorin alla oleva piste."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2070,5 +2073,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2265,5 +2268,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "rata"
@@ -2285,127 +2288,127 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Poistettu jäsen \"{0}\" relaatiossa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Tuntematon rooli \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "ei tageja"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "teksti"
@@ -2413,5 +2416,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2439,5 +2442,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "tausta"
@@ -2499,5 +2502,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2511,5 +2514,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2539,14 +2542,14 @@
 msgstr "Ristiriidan ratkaisuksi valittu versio:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Päivän viestiä ei ole saatavilla"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Ladataan \"Päivän viestiä\""
@@ -2612,71 +2615,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Käyttäjänimi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "käyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "valinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Näytä tämä ohje"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
+msgid "Standard unix geometry argument"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+msgid "Download the bounding box"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
-msgid "Standard unix geometry argument"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
-msgid "Download the bounding box"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid "Download the bounding box as raw gps"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+msgid "Select with the given search"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+msgid "Launch in maximized mode"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
-msgid "Download the bounding box as raw gps"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
-msgid "Select with the given search"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
-msgid "Launch in maximized mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Reset the preferences to default"
 msgstr "Palauta oletusasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Aseta kieli."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "esimerkkejä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2684,23 +2687,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Aktivoidaan päivitetyt liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Ladataan aikaisia liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Asetetaan oletuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Ladataan liitännäiset"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2742,5 +2750,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242
 msgid "Full Screen"
-msgstr ""
+msgstr "Koko näyttö -tila"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
@@ -2879,5 +2887,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3088,5 +3096,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Rooli"
@@ -3134,73 +3142,71 @@
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Toteuta muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Luo uusi relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Muokkaa uutta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Muokkaa relaatiota #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Perus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Jäsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Tagit (tyhjä arvo poistaa tagin)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Siirrä ylöspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Siirrä valittuja jäseniä ylöspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Lisää valitut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Lisää valitut objektit jäseniksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Poista valitut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Poista kaikki valitut objektit relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Siirrä alaspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Siirrä valittuja jäseniä alaspäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3209,36 +3215,36 @@
 msgstr "Poista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Jäsenet: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relaatioeditori: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Tuonnin aikana oli ristiriitoja."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Virhe palvelimen vastauksen käsittelyssä."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Palvelimeen ei voida yhdistää."
@@ -3252,10 +3258,11 @@
 msgstr "Poista valittu relaatio"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relaatiot"
@@ -3449,5 +3456,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Paikat"
@@ -3494,21 +3501,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "tyyppi"
@@ -3563,10 +3570,7 @@
 "siirtääksesi näkymää."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Kartta"
@@ -3720,4 +3724,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3823,5 +3828,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3878,19 +3883,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "ladatun alueen ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Versio {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} koostuu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} poistettu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "käyttö"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Versio {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3898,21 +3918,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4119,4 +4139,6 @@
 "the audio currently playing was recorded."
 msgstr ""
+"Näytä kartalla toistettavan äänen nauhoituspaikan mukana liikkuva merkki. "
+"Paikka saadaan gps-jäljestä."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:78
@@ -4332,5 +4354,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4415,4 +4437,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4496,7 +4520,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4509,7 +4530,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4525,10 +4553,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4697,5 +4725,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4729,7 +4759,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4813,4 +4843,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4863,4 +4901,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4869,7 +4913,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4878,15 +4919,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4911,129 +4941,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Nimi"
@@ -5083,10 +5115,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Local files"
-msgstr ""
+msgstr "Paikalliset tiedostot"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "ei mitään"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5108,50 +5139,40 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
 msgid "Single Color (can be customized for named layers)"
-msgstr ""
+msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
 
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Auto"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Polkupyörä"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5159,25 +5180,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Jalankulku (foot)"
@@ -5225,5 +5251,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
@@ -5446,5 +5471,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Settings for the audio player and audio markers."
-msgstr ""
+msgstr "Äänentoiston ja äänitiedostomerkkien asetukset."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
@@ -5509,5 +5534,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
 msgid "Base Server URL"
-msgstr ""
+msgstr "Karttatietokantapalvelun URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
@@ -5570,4 +5595,6 @@
 "josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
+"Tagien esivalintatiedot (URL-osoite tai tiedostonimi). Lisätietoja "
+"osoitteessa http://josm.openstreetmap.de/wiki/TaggingPresets"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
@@ -5846,10 +5873,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "Null-osoitinpoikkeus, mahdollisesti puuttuvia tageja."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Valmistellaan karttatietoja..."
@@ -5859,25 +5886,75 @@
 msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Suljetaan muutoskokoelma..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Ei lähetettäviä muutoksia."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Valmistellaan..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Lähetetään..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Virhe palvelimen vastauksen käsittelyssä."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Tuntematon palvelin"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Virheellinen salasana tai käyttäjänimi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Varoitus: salasana lähetetään salaamattomana."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5888,44 +5965,52 @@
 msgstr "Virhe jäsennettäessä."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Tuntematon versio"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Tuntematon versio"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "<nd>-elementti muussa kuin polussa."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "<member>-tagi muussa kuin relaatiossa."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Virheellinen objekti (id=0)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Puuttuva pakollinen attribuutti \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Ohitetaan polku, jonka jotain pistettä ei ole olemassa: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Valmistellaan OSM-karttatietoja..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Vääränlainen pisteen id"
@@ -5935,10 +6020,10 @@
 msgstr "Yhdistetään palvelimeen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr "OSM-palvelimeen ei voitu yhdistää. Tarkista internetyhteytesi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5948,55 +6033,8 @@
 "myöhemmin uudestaan."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Lähetä kommentti"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Virhe tapahtui: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Palvelin ei tue muutoskokoelmia"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Tuntematon palvelin"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Valmistellaan..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Lähetetään..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Suljetaan muutoskokoelma..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6170,6 +6208,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "tuntematon"
@@ -6357,7 +6395,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Luo alueita"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6376,7 +6413,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Luo alueita"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6400,5 +6436,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Kuvaus"
@@ -6910,5 +6946,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "French cadastre WMS"
-msgstr ""
+msgstr "Ranskan kiinteistörekisteri-WMS"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
@@ -7640,7 +7676,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "vesi"
@@ -7943,5 +7979,5 @@
 msgstr "OpenStreetBugs-latauslooppi"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Näyttä OpenStreetBugs-ongelmat"
@@ -7960,4 +7996,11 @@
 msgstr "Varoitus"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Virhe tapahtui: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7985,35 +8028,38 @@
 "OpenStreetBugs:sta"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Lisää kommentti"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Syötä kommenttisi"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Merkitse valmiiksi"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Suljetaanko?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Uusi ongelma"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Luo ongelma"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Kuvaile ongelma tarkasti"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Luo ongelma"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8042,5 +8088,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8050,9 +8096,9 @@
 "asetusten karttasivulta."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr ""
@@ -8092,4 +8138,6 @@
 "talking to the plugin."
 msgstr ""
+"Etähallintaliitännäinen odottaa yhteyksiä koneellesi porttiin 8111. Muut "
+"ohjelmat ottavat yhteyttä tähän porttiin, joten porttinumeroa ei voi vaihtaa."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
@@ -8120,95 +8168,76 @@
 msgstr ""
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr ""
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Ei mitään"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-#, fuzzy
-msgid "Click to add route nodes."
-msgstr "Napsauta lisätäksesi uuden pisteen."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-#, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Napsauta lisätäksesi uuden pisteen."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Poistetaan pisteiden kaksoiskappaleet..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
+msgid "Click to add destination."
+msgstr "määränpää"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "Avaa lista kaikista relaatioista."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Asema"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+msgid "Add routing layer"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "yhdystie"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Pikanäppäin"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Nopeammin"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Käännä polut"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Lauttareitti"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "WMS-liitännäisen asetukset"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Muokkaa liitännäissivustoja"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Liittymä"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Maksiminopeus (km/h)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Korkeus"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8216,33 +8245,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr ""
@@ -8265,34 +8294,34 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr ""
@@ -8307,5 +8336,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8360,7 +8389,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Muokkaa osavaltion ominaisuuksia"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8375,12 +8403,10 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "ei mitään"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "korostus"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -8388,5 +8414,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8395,5 +8421,5 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -8403,7 +8429,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "reitti"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
@@ -8413,19 +8438,16 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Etsi"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Tiedosto"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Auto"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8509,5 +8531,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Kadunnimi"
@@ -8615,17 +8637,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relaatio"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Yhdistä päällekkäiset alueet"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Yhdistä päällekkäiset alueet"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8636,12 +8655,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Yhdistämisristiriidat"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Poista relaatiosta"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8650,17 +8667,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Sulkemattomat polut"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Poista kuva tasosta"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Moottoritien liittymä"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -8772,5 +8786,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
 msgid "Show informational level on upload."
-msgstr ""
+msgstr "Näytä myös huomautukset ennen tietojen lähetystä"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
@@ -9020,5 +9034,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
 msgid "Properties checker :"
-msgstr ""
+msgstr "Ominaisuustarkistin:"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
@@ -9104,5 +9118,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Check property keys."
-msgstr ""
+msgstr "Tarkista ominaisuuksien avaimet"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
@@ -9144,5 +9158,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
 msgid "Data sources"
-msgstr ""
+msgstr "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
@@ -9165,9 +9179,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "Check for paint notes."
-msgstr ""
+msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
 msgid "Check if map painting found data errors."
-msgstr ""
+msgstr "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
@@ -9264,4 +9278,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9343,7 +9363,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "rakennus"
@@ -9357,5 +9377,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "alue"
@@ -9574,5 +9594,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
+msgstr "Voit muokata käytettävissä olevien WMS-palvelinten listaa"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
@@ -9633,4 +9653,9 @@
 #: build/specialmessages.java:9
 msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
 msgstr ""
 
@@ -9659,7 +9684,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Luo alueita"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9750,21 +9774,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9773,15 +9804,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9791,15 +9822,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9808,5 +9839,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9815,5 +9846,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9822,5 +9853,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9910,5 +9941,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Numero"
@@ -9963,7 +9994,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Taso"
@@ -10006,5 +10037,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Maksiminopeus (km/h)"
@@ -10052,5 +10083,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Yksisuuntainen"
@@ -10106,5 +10137,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Silta"
@@ -10154,5 +10185,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunneli"
@@ -10199,5 +10230,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Maaleikkaus"
@@ -10244,5 +10275,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Penger"
@@ -10400,6 +10431,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr ""
@@ -10448,5 +10479,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Pinta"
@@ -10478,5 +10509,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "päällystetty"
@@ -10487,5 +10518,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "päällystämätön"
@@ -10499,5 +10530,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "mukulakivi"
@@ -10649,5 +10680,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10668,6 +10699,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "kyllä"
@@ -10811,7 +10842,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "ei"
@@ -10825,73 +10856,63 @@
 msgstr "Raskaat ajoneuvot (3.5 tonnia) (hgv)"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Hevonen"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Moottoripyörä"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Auto"
@@ -10966,130 +10987,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Tyyppi"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11097,5 +11006,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11103,11 +11012,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11115,5 +11018,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11121,5 +11024,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11127,5 +11030,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11133,6 +11036,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11151,6 +11060,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "moottoritie"
@@ -11176,6 +11085,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "valtatie"
@@ -11201,6 +11110,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "kantatie"
@@ -11226,6 +11135,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "seututie"
@@ -11239,5 +11148,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "yhdystie"
@@ -11255,5 +11164,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "asuinkatu"
@@ -11271,5 +11180,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr ""
@@ -11296,6 +11205,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr ""
@@ -11336,6 +11245,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11346,5 +11254,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -11688,14 +11596,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Operaattori"
@@ -11720,20 +11628,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "saari"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11741,5 +11649,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11748,5 +11656,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11756,5 +11664,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11903,10 +11811,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr ""
@@ -11919,29 +11828,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr ""
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11950,7 +11848,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11959,69 +11860,54 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Sallitut kulkumuodot:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr ""
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
 #: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr ""
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Laskusilta"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Muokkaa laskusillan ominaisuuksia"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
 msgid "Bus Trap"
 msgstr ""
@@ -12029,36 +11915,87 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr ""
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
 #: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr ""
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr ""
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Laskuristikko"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Muokkaa laskuristikkoa"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+msgid "Border Control"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr ""
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Pensasaita"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Aita"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Muuri"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Kaupunginmuuri"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr ""
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "Portti"
@@ -12066,128 +12003,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Pensasaita"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Aita"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Muuri"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Kaupunginmuuri"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr ""
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr ""
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr ""
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Vesi"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Lähde"
@@ -12195,5 +12084,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Muokkaa lähteen ominaisuuksia"
@@ -12201,5 +12090,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr ""
@@ -12207,21 +12096,21 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
+#: build/trans_presets.java:1028
+msgid "Edit Drain"
+msgstr ""
+
+#. item "Water/Drain" combo "Layer"
+#: build/trans_presets.java:1034
+msgid "Stream"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
+#: build/trans_presets.java:1036
+msgid "Edit Stream"
+msgstr ""
+
+#. item "Water/Stream" combo "Layer"
 #: build/trans_presets.java:1042
-msgid "Edit Drain"
-msgstr ""
-
-#. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
-msgid "Stream"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
-msgid "Edit Stream"
-msgstr ""
-
-#. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
 msgid "Canal"
 msgstr "Kanava"
@@ -12229,10 +12118,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Joki"
@@ -12242,5 +12131,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Muokkaa joen ominaisuuksia"
@@ -12248,15 +12137,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Muokkaa veden ominaisuuksia"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Muokkaa maan ominaisuuksia"
@@ -12264,15 +12153,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Tekojärvi"
@@ -12280,15 +12169,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Muokkaa tekojärven ominaisuuksia"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -12296,5 +12185,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Joentörmä"
@@ -12303,10 +12192,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Muokkaa joentörmän ominaisuuksia"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Kosteikko"
@@ -12317,56 +12206,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Muokkaa kosteikon ominaisuuksia"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "suo"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "räme"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "suo"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Muta"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Muokkaa mudan ominaisuuksia"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Ranta"
@@ -12374,20 +12263,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Muokkaa rannan ominaisuuksia"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Lahti"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Muokkaa lahden ominaisuuksia"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Kallio"
@@ -12395,10 +12284,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Muokkaa kallion ominaisuuksia"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Rantaviiva"
@@ -12406,5 +12295,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Muokkaa rantaviivan ominaisuuksia"
@@ -12412,5 +12301,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Lauttareitti"
@@ -12418,5 +12307,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr ""
@@ -12425,5 +12314,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr ""
@@ -12431,10 +12320,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Telakka"
@@ -12442,5 +12331,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr ""
@@ -12448,5 +12337,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Pato"
@@ -12454,15 +12343,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Sulkuportti"
@@ -12471,5 +12360,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr ""
@@ -12477,20 +12366,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Vesiputous"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Muokkaa vesiputouksen ominaisuuksia"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr ""
@@ -12499,15 +12388,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Venesatama"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Laituri"
@@ -12515,10 +12404,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Muokkaa laiturin ominaisuuksia"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Lauttaterminaali"
@@ -12526,10 +12415,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr ""
@@ -12539,5 +12428,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr ""
@@ -12545,10 +12434,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Rata"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Rata"
@@ -12556,5 +12445,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr ""
@@ -12584,8 +12473,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr ""
@@ -12599,35 +12488,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "sivuraide"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Kapean raideleveyden rata"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Muokkaa kapean raideleveyden rataa"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Monorail"
@@ -12635,45 +12524,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Säilytetty"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Muokkaa museroradan ominaisuuksia"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Pikaraitiotie"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Muokkaa metron ominaisuuksia"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Raitiotie"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr ""
@@ -12681,5 +12570,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -12688,14 +12577,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Käytöstä poistettu rata"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Purettu rata"
@@ -12704,5 +12593,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Tasoristeys"
@@ -12711,5 +12600,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Risteys"
@@ -12719,5 +12608,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12725,5 +12614,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Kääntöpöytä"
@@ -12732,10 +12621,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Köysiradat"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Tuolihissi"
@@ -12743,10 +12632,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Hiihtohissi"
@@ -12754,10 +12643,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Muokkaa hiihtohissin ominaisuuksia"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Köysirata"
@@ -12765,24 +12654,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Muokkaa köysiradan ominaisuuksia"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Muokkaa eläintarhan ominaisuuksia"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Asema"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Polttoaine"
@@ -12792,5 +12694,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Muokkaa huoltoaseman ominaisuuksia"
@@ -12806,5 +12708,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12814,5 +12716,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Muokkaa pysäköinnin ominaisuuksia"
@@ -12820,40 +12722,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Paikkojen lukumäärä"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "monikerroksinen"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "maanalainen"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Invapaikkojen lukumäärä"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Maksu"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Autopesula"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Muokkaa autopesulan ominaisuuksia"
@@ -12861,5 +12764,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Kauppa"
@@ -12867,15 +12770,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Korjaamo"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Muokkaa autokorjaamon ominaisuuksia"
@@ -12883,5 +12786,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Vuokraamo"
@@ -12890,10 +12793,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Muokkaa autovuokraamon ominaisuuksia"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr ""
@@ -12901,5 +12804,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr ""
@@ -12907,5 +12810,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Muokkaa pyörätelineen ominaisuuksia"
@@ -12914,5 +12817,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia"
@@ -12921,15 +12824,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Julkinen liikenne"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr ""
@@ -12937,5 +12840,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Rautatien seisake"
@@ -12943,5 +12846,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Muokkaa rautatien seisaketta"
@@ -12949,5 +12852,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Raitiovaunupysäkki"
@@ -12956,5 +12859,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Muokkaa raitiovaunupysäkkiä"
@@ -12962,5 +12865,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Asemalaituri"
@@ -12969,5 +12872,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Muokkaa laiturin asetuksia"
@@ -12979,5 +12882,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr ""
@@ -12985,10 +12888,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Alue"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Metron sisäänkäynti"
@@ -12997,10 +12900,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -13009,5 +12912,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Linja-autoasema"
@@ -13016,5 +12919,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Muokkaa linja-autoaseman ominaisuuksia"
@@ -13022,5 +12925,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Linja-autopysäkki"
@@ -13030,5 +12933,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Muokkaa linja-autopysäkin ominaisuuksia"
@@ -13036,10 +12939,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr ""
@@ -13047,5 +12950,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taksi"
@@ -13053,5 +12956,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Muokkaa taksitolppaa"
@@ -13059,5 +12962,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Lentokenttä"
@@ -13065,15 +12968,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13082,5 +12985,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Majoittuminen"
@@ -13092,5 +12995,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotelli"
@@ -13099,15 +13002,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Muokkaa hotellia"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Tähdet"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motelli"
@@ -13115,20 +13018,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Muokkaa motellin ominaisuuksia"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -13136,10 +13039,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Hostelli"
@@ -13147,30 +13050,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -13178,10 +13081,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -13192,5 +13095,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ravintola"
@@ -13198,5 +13101,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Muokkaa ravintolan ominaisuuksia"
@@ -13204,5 +13107,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr ""
@@ -13210,61 +13113,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -13272,9 +13175,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Kahvila"
@@ -13282,42 +13185,42 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
 #. item "Food+Drinks/Cafe" text "Name"
+#: build/trans_presets.java:1599
+msgid "Pub"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
+#: build/trans_presets.java:1601
+msgid "Edit Pub"
+msgstr ""
+
+#. item "Food+Drinks/Pub" text "Name"
+#: build/trans_presets.java:1605
+msgid "Biergarten"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1606
-msgid "Pub"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
-msgid "Edit Pub"
-msgstr ""
-
-#. item "Food+Drinks/Pub" text "Name"
+msgid "Edit Biergarten"
+msgstr ""
+
+#. item "Food+Drinks/Biergarten" text "Name"
+#: build/trans_presets.java:1610
+msgid "Bar"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #: build/trans_presets.java:1612
-msgid "Biergarten"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1613
-msgid "Edit Biergarten"
-msgstr ""
-
-#. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
-msgid "Bar"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -13325,20 +13228,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr ""
@@ -13347,22 +13250,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Aukioloajat"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "Museo"
@@ -13370,10 +13262,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -13382,10 +13274,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -13393,25 +13285,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "Taideteos"
@@ -13419,5 +13311,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr ""
@@ -13425,77 +13317,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "kartta"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr ""
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "pyöräkartta"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr ""
@@ -13503,25 +13407,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Linna"
@@ -13530,20 +13434,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -13552,20 +13456,32 @@
 #. <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:1727
+msgid "Edit Archaeological Site"
+msgstr ""
+
+#. item "Historic Places/Archaeological Site" text "Name"
 #: build/trans_presets.java:1731
-msgid "Edit Archaeological Site"
-msgstr ""
-
-#. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+msgid "Battlefield"
+msgstr "Taistelukenttä"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr ""
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -13573,56 +13489,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Taistelukenttä"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr ""
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -13630,15 +13535,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr ""
@@ -13646,15 +13551,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -13668,6 +13573,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -13746,4 +13651,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14035,28 +13948,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "urheilu"
@@ -14066,227 +13980,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "amerikkalainen jalkapallo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskuksen ominaisuuksia"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr ""
@@ -14325,191 +14239,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Pyöräily"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Unti"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr ""
@@ -14517,56 +14431,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:1920
+msgid "Edit Skiing"
+msgstr ""
+
+#. item "Sport/Skiing" text "Name"
 #: build/trans_presets.java:1923
-msgid "Edit Skiing"
-msgstr ""
-
-#. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
+#: build/trans_presets.java:1924
+msgid "Difficulty"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:1924
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
+msgstr "terminaali"
+
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
+msgstr "päällystetty"
+
+#: build/trans_presets.java:1924
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "Difficulty"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
-msgid "novice"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "easy"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "intermedia"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "advance"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "Ammunta"
@@ -14574,178 +14490,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Amerikkalainen jalkapallo"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
+#: build/trans_presets.java:1967
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
 #: build/trans_presets.java:1970
-msgid "Edit Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Rakennukset"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Rakennus"
@@ -14753,5 +14669,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -14759,10 +14675,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -14770,10 +14686,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -14781,10 +14697,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -14793,10 +14709,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Vankila"
@@ -14805,10 +14721,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Poliisiasema"
@@ -14818,10 +14734,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -14830,10 +14746,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -14841,5 +14757,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -14847,15 +14763,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Koulu"
@@ -14863,10 +14779,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Yliopisto"
@@ -14874,10 +14790,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Korkeakoulu"
@@ -14885,5 +14801,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -14891,5 +14807,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -14898,10 +14814,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Kirjasto"
@@ -14910,10 +14826,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -14921,10 +14837,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Teatteri"
@@ -14933,10 +14849,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr ""
@@ -14946,5 +14862,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr ""
@@ -14953,6 +14869,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Uskonto"
@@ -14961,66 +14877,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
+msgstr "italialainen"
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr ""
@@ -15029,81 +14946,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -15112,5 +15029,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -15118,5 +15035,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Talon numero"
@@ -15124,20 +15041,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Maakoodi"
@@ -15145,5 +15062,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -15152,5 +15069,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -15158,67 +15075,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "kaikki"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Tehdas"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Torni"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -15226,10 +15147,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -15237,10 +15158,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Putki"
@@ -15248,10 +15169,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -15261,10 +15182,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Nosturi"
@@ -15272,10 +15193,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Loisto"
@@ -15283,10 +15204,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr ""
@@ -15294,10 +15215,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -15305,5 +15226,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
@@ -15311,5 +15232,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr ""
@@ -15319,39 +15240,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "kaasu"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr ""
@@ -15360,10 +15281,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -15372,5 +15293,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -15378,10 +15299,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -15392,5 +15313,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
@@ -15398,5 +15319,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -15405,25 +15326,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Jännite"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Johtojen määrä"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Käymälä"
@@ -15431,25 +15352,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr ""
 
-#. item "Amenities/Toilets" text "Reference number"
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
+msgid "Note"
+msgstr ""
+
+#. item "Amenities/Toilets" text "Note"
 #: build/trans_presets.java:2307
-msgid "Charge"
-msgstr ""
-
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
-msgid "Note"
-msgstr ""
-
-#. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Puhelin"
@@ -15458,5 +15374,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -15464,5 +15380,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Kolikot"
@@ -15470,5 +15386,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr ""
@@ -15476,5 +15392,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -15482,5 +15398,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr ""
@@ -15488,15 +15404,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -15505,5 +15421,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -15511,35 +15427,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Penkki"
@@ -15548,20 +15464,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr ""
@@ -15569,22 +15485,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Lähde"
@@ -15593,10 +15509,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -15605,10 +15521,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr ""
@@ -15616,25 +15532,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -15642,10 +15558,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kioski"
@@ -15653,10 +15569,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -15664,5 +15580,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -15670,88 +15586,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -15759,10 +15675,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Leipomo"
@@ -15770,10 +15686,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr ""
@@ -15781,70 +15697,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Koulu"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Pyöräkauppa"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
-msgstr ""
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
+msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr ""
@@ -15852,10 +15782,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -15863,10 +15793,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -15874,60 +15804,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 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:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -15935,10 +15865,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Pesula"
@@ -15946,10 +15876,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr ""
@@ -15957,35 +15887,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Urheilu"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr ""
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "optikko"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Pankki"
@@ -15993,5 +15925,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
@@ -15999,10 +15931,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -16010,5 +15942,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -16016,15 +15948,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -16032,20 +15964,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -16053,5 +15985,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -16059,10 +15991,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Sairaala"
@@ -16070,10 +16002,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr ""
@@ -16082,5 +16014,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -16089,20 +16021,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -16110,5 +16042,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -16117,25 +16049,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
@@ -16143,45 +16075,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Osavaltio"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Seutu"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr ""
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Iso kaupunki"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Kaupunki"
@@ -16189,10 +16122,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -16200,30 +16133,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Kunta"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr ""
@@ -16231,10 +16165,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Saari"
@@ -16242,5 +16176,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
@@ -16248,5 +16182,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -16254,10 +16188,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Huippu"
@@ -16265,10 +16199,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -16276,10 +16210,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -16287,70 +16221,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Kansallinen"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Puu"
@@ -16359,15 +16293,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Metsä"
@@ -16376,5 +16310,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -16382,17 +16316,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -16401,19 +16335,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "kivikko, rakka"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Muokkaa kivikon ominaisuuksia"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Pusikko"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Muokkaa pusikon ominaisuuksia"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Tunturi"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Muokkaa tunturin ominaisuuksia"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Nummi"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Muokkaa nummen ominaisuuksia"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -16422,70 +16400,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16493,10 +16472,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr ""
@@ -16504,20 +16483,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Puisto"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr ""
@@ -16525,5 +16504,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -16531,15 +16510,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -16547,9 +16526,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -16557,39 +16536,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -16597,114 +16576,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Sotilasvoimat"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Rakennustyömaa"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Muokkaa rakennustyömaan ominaisuuksia"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Rakennustyömaa"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Muokkaa rakennustyömaan ominaisuuksia"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Sotilasvoimat"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "kivikko, rakka"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Muokkaa kivikon ominaisuuksia"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Pusikko"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Muokkaa pusikon ominaisuuksia"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Tunturi"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Muokkaa tunturin ominaisuuksia"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Nummi"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Muokkaa nummen ominaisuuksia"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr ""
@@ -16714,5 +16650,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr ""
@@ -16721,10 +16657,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr ""
@@ -16732,5 +16668,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr ""
@@ -16739,5 +16675,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -16745,34 +16681,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr ""
@@ -16781,15 +16717,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr ""
@@ -16797,5 +16733,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16804,5 +16740,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16810,5 +16746,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -16880,24 +16816,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -16942,4 +16878,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16949,19 +16888,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -16975,10 +16915,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -16986,26 +16926,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr ""
@@ -17014,30 +16954,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17221,4 +17161,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17230,4 +17277,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17329,11 +17385,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr ""
@@ -17375,7 +17433,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr ""
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Esteet"
 
 #. color tertiary
@@ -17411,6 +17684,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr ""
@@ -17466,7 +17739,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr ""
@@ -17513,108 +17786,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr ""
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr ""
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17631,4 +17817,9 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+msgid "services"
+msgstr ""
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17638,4 +17829,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Kahluupaikka"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17652,8 +17849,21 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "kääntöympyrä"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
+msgstr ""
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17665,5 +17875,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr ""
@@ -17677,5 +17887,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr ""
@@ -17689,5 +17899,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr ""
@@ -17715,5 +17925,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr ""
@@ -17728,4 +17938,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17765,5 +17976,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17880,12 +18091,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr ""
@@ -17931,5 +18143,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17947,7 +18159,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17970,10 +18182,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -18003,6 +18215,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -18047,6 +18259,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -18060,5 +18272,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminaali"
@@ -18080,5 +18292,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -18092,5 +18304,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -18113,4 +18325,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18130,4 +18350,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr ""
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18136,23 +18362,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr ""
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr ""
@@ -18166,5 +18379,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr ""
@@ -18178,5 +18392,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr ""
@@ -18189,6 +18404,20 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+msgid "piste_expert"
+msgstr ""
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18202,5 +18431,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr ""
@@ -18231,4 +18461,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18263,4 +18501,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18273,8 +18535,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr ""
@@ -18287,5 +18551,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr ""
@@ -18299,5 +18566,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr ""
@@ -18425,12 +18692,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr ""
@@ -18444,5 +18711,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr ""
@@ -18514,8 +18781,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18551,4 +18818,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18608,11 +18883,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18751,6 +19026,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18977,22 +19273,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -19024,6 +19320,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -19059,4 +19355,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19076,7 +19380,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr ""
@@ -19170,4 +19475,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19370,4 +19683,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19401,28 +19730,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr ""
@@ -19476,4 +19807,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19486,8 +19825,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotelli"
@@ -19542,4 +19881,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19636,9 +19976,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr ""
@@ -19710,8 +20050,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr ""
@@ -19781,9 +20121,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr ""
@@ -19797,5 +20137,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "louhos"
@@ -19809,5 +20149,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr ""
@@ -19829,5 +20169,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr ""
@@ -19841,5 +20181,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "talousmetsä"
@@ -19853,5 +20193,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -19874,5 +20214,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr ""
@@ -19886,5 +20226,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr ""
@@ -19898,5 +20238,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19910,5 +20250,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -19922,5 +20262,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -19977,7 +20317,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr ""
@@ -19991,5 +20331,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr ""
@@ -20002,5 +20342,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr ""
@@ -20015,5 +20355,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr ""
@@ -20027,5 +20367,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "tulivuori"
@@ -20040,4 +20380,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20079,7 +20420,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr ""
@@ -20093,5 +20435,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr ""
@@ -20105,5 +20447,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr ""
@@ -20117,5 +20459,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "metsä"
@@ -20129,5 +20471,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr ""
@@ -20141,5 +20483,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr ""
@@ -20217,8 +20559,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "reitti"
@@ -20266,7 +20608,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr ""
@@ -20408,10 +20750,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr ""
@@ -20452,6 +20794,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr ""
@@ -20733,156 +21082,33 @@
 msgstr ""
 
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Ole hyvä ja valitse jotain ristiriitalistasta"
-
-#~ msgid "Please select a color."
-#~ msgstr "Valitse väri."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Älä käynnistä kokonäyttötilassa"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Uutisia JOSM:sta"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Napsauta lisätäksesi uuden polun olemassa olevaan pisteeseen."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Napsauta tehdäksesi yhteyden olemassa olevaan pisteeseen."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Napsauta lisätäksesi pisteen ja luodaksesi uuden polun."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Napsauta lisätäksesi uuden pisteen ja tehdäksesi yhteyden."
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr "Ole hyvä ja valitse objektit, joiden ominaisuuksia haluat muokata."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "Tämä on yksinkertainen relaatiomuokkain, joka mahdollistaa relaation "
-#~ "tagien ja jäsenien muokkauksen."
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Lähetä tämä jälki..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Tämä toiminnallisuus on lisätty vasta lähiaikoina. <br>Käytä sitä "
-#~ "varoen ja tarkista, että se toimii odotetusti,</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Lähetä JOSM:n käsittelemä jälki"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Lähetä raakatiedosto: "
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Tagit (avainsanat GPX-tiedostossa):"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "GPX-lähetys"
-
-#~ msgid "time"
-#~ msgstr "aika"
-
-#~ msgid "desc"
-#~ msgstr "kuvaus"
-
-#~ msgid "symbol"
-#~ msgstr "symboli"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Lähetä raakatiedosto: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Tagit:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "Valitse jäljen värisävy nopeuden perusteella kussakin kohdassa."
-
-#~ msgid "Unknown type"
-#~ msgstr "Tuntematon tyyppi"
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Lähetetään {0} {1} (id: {2}) {3}% {4}/{5} ({6} jäljellä)..."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Muokkaa liittymää"
-
-#~ msgid "Exit Number"
-#~ msgstr "Liittymän numero"
-
-#~ msgid "Waterway"
-#~ msgstr "Vesiväylä"
-
-#~ msgid "political"
-#~ msgstr "poliittinen"
-
-#~ msgid "National_park"
-#~ msgstr "Kansallispuisto"
-
-#~ msgid "Natural"
-#~ msgstr "Luonto"
-
-#~ msgid "Version"
-#~ msgstr "Versio"
-
-#~ msgid "Install"
-#~ msgstr "Asenna"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Versio: {0}<br>Viimeisin muutos: {1}"
-
-#~ msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-#~ msgstr "Surveyor -liitännäinen tarvitsee LiveGps -liitännäisen."
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr "LiveGps -liitännäistä ei löytynyt, asenna ja ota se käyttöön ensin."
-
-#~ msgid "SurveyorPlugin is disabled for the moment"
-#~ msgstr "Surveyor -liitännäinen on poistettu käytöstä."
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Versio {0} - Viimeisin muutos: {1}"
-
-#~ msgid "Open waypoints file"
-#~ msgstr "Avaa reittipistetiedosto"
-
-#~ msgid "Open a waypoints file."
-#~ msgstr "Avaa reittipistetiedosto."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "Datavirhe: leveysaste \"{0}\" on rajojen ulkopuolella."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "Datavirhe: pituusaste \"{0}\" on rajojen ulkopuolella."
-
-#~ msgid "NoName"
-#~ msgstr "EiNimeä"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Virheellinen URL"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Ladataan \"Päivän viestiä\""
-
-#~ msgid "Upload GPX track"
-#~ msgstr "Lähetä GPX-jälki"
-
-#~ msgid "Update available"
-#~ msgstr "Päivitys saatavilla"
-
-#~ msgid ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
-#~ msgstr ""
-#~ "Versio: {2}; Uusin testattu: {0}; <font style=\"font-size:x-small\">"
-#~ "(uusin testaamaton: {1} &#150; käyttö ei ole suositeltua)</font>"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Avaa..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Kuvaus"
+
+#~ msgid "Commit comment"
+#~ msgstr "Lähetä kommentti"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Palvelin ei tue muutoskokoelmia"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Laskusilta"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Muokkaa laskusillan ominaisuuksia"
+
+#~ msgid "Portcullis"
+#~ msgstr "Laskuristikko"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Muokkaa laskuristikkoa"
Index: /applications/editors/josm/i18n/po/fr.po
===================================================================
--- /applications/editors/josm/i18n/po/fr.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/fr.po	(revision 14844)
@@ -6,6 +6,6 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-28 21:56+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-27 21:39+0000\n"
 "Last-Translator: metehyi <Unknown>\n"
 "Language-Team: Fr\n"
@@ -14,9 +14,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Création de l’interface graphique d'utilisateur (GUI)"
@@ -36,5 +36,5 @@
 "EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -42,36 +42,36 @@
 "sur le serveur."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Modifications non enregistrées"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr ""
-"Il existe des modifications qui n'ont pas été sauvegardées. Ecarter les "
-"modifications et continuer ?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+"Certaines modifications n'ont pas été sauvegardées. Perdre ces modifications "
+"et continuer ?"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Enregistrer et quitter"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Annuler et quitter"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -82,10 +82,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -96,4 +96,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -103,10 +104,10 @@
 msgstr "Annuler"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorant l’URL malformé : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -132,8 +133,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -274,5 +275,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -411,6 +412,6 @@
 msgstr "Inverser et fusionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -418,20 +419,20 @@
 msgstr "Entrer des valeurs pour tous les conflits."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Résoudre les conflits"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
-msgstr "Fusionner {0} chemins"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+msgstr "Fusionner {0} voies"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
-msgstr "Tous les chemins étaient vides"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+msgstr "Toutes les voies étaient vides"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -535,5 +536,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -654,6 +655,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -662,6 +663,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -792,5 +793,5 @@
 msgstr "Fusionner tout de même"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -798,5 +799,5 @@
 "encore utilisé"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1076,5 +1077,5 @@
 msgstr "Sauvegarder les données actuelles."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1084,26 +1085,26 @@
 "Merci de signaler ceci comme une erreur."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Aucun document ouvert donc rien à sauvegarder."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Document vide"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Le document ne contient pas de données."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Sauvegarder tout de même"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Conflits"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1113,32 +1114,32 @@
 "sauvegardés si vous ne les traitez pas. Continuer ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Rejeter les conflits et sauvegarder"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Sauvegarder le fichier GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Sauvegarder le fichier OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Impossible de sauvegarder le fichier."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Extension de fichier inconnue."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Une erreur est survenue lors de la sauvegarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Une erreur est survenue lors de la restauration de la sauvegarde."
@@ -1196,18 +1197,18 @@
 msgstr "Fermer"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Couper un chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Séparer un chemin au nœud sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1215,5 +1216,5 @@
 msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1229,9 +1230,9 @@
 "sélectionner le chemin également."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "Les nœuds sélectionnés ne font pas partie du même chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1239,11 +1240,11 @@
 msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1253,5 +1254,5 @@
 "sélectionner les nœuds au milieu du chemin.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1262,5 +1263,5 @@
 "Vous devriez vérifier cela et corriger si nécessaire."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1417,47 +1418,51 @@
 "continuer ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Chargement vers OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Envoyer tous les changements sur le serveur OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Objets à ajouter :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Objets à modifier :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Objets à supprimer :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Fournissez un bref commentaire aux changements que vous envoyez :"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Charger ces changements ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Envoyer les changements"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Rien à envoyer. Obtenez d’abord des données."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr ""
 "Certains conflits ne sont pas résolus. Vous devez d’abord les résoudre."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Aucun changement à envoyer."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Envoi des données"
@@ -1643,31 +1648,33 @@
 msgstr "Impossible d'ajouter un nœud en dehors du monde"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Ajouter un nœud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Ajouter un nœud au chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Connecter le chemin existant au nœud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Ajouter un nœud à un chemin existant."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Ajouter un nœud sur le chemin et le connecter"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Créer un nouveau nœud."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Sélectionner le nœud sous le curseur."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1676,9 +1683,4 @@
 msgstr[0] "Ajouter un nouveau nœud au chemin."
 msgstr[1] "Ajouter un nouveau nœud aux {0} chemins."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Sélectionner le nœud sous le curseur."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2109,5 +2111,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2304,5 +2306,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "voie ferrée"
@@ -2324,114 +2326,114 @@
 msgstr[1] "{0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "La zone n'est pas fermée."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Le multipolygone \"{0}\" n'est pas fermé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Membre vide dans la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Membre \"{0}\" supprimé de la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Chemin \"{0}\" comporte moins de deux points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Plus d'un chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Plus d'un chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "Plus d'un \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rôle inconnu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Type de membre inconnu pour \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Pas de chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Pas de chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "Pas de noeud ou de chemin \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Le style de la restriction {0} n'a pas été trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-chemin \"{0}\" dans le multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Le chemin intérieur \"{0}\" est à l'extérieur."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
@@ -2439,14 +2441,14 @@
 "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "non étiqueté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "texte"
@@ -2454,5 +2456,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2480,5 +2482,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "arrière-plan"
@@ -2545,5 +2547,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2557,5 +2559,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2585,14 +2587,14 @@
 msgstr "version choisie :"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Message du jour non disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "- version utilisée {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Téléchargement du \"Message du jour\""
@@ -2666,14 +2668,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -2682,57 +2684,57 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "Options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Montrer cette aide"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Argument de géométrie standard UNIX"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Télécharge la zone sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Télécharge l’emplacement donné par l’URL (avec lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Ouvrir fichier (données brutes gps, si .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Télécharger la zone sélectionnée en données GPS brut."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Sélectionner avec la recherche actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr "Lancer maximisé"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Rétablir les préférences par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Définir la langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "exemples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2743,23 +2745,28 @@
 "sur d’avoir chargé des données avant --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Activation des greffons mis à jour"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Chargement des premiers greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Régalage des valeurs par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Chargement des greffons"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2940,5 +2947,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3156,5 +3163,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Rôle"
@@ -3202,73 +3209,71 @@
 msgstr "Propriétés / Appartenances"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Appliquer les modifications"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Créer une nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Éditer une nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Editer la relation #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Basique"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Occupé par"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Déplacer vers le haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Déplacer les membres sélectionnés vers le haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Ajouter la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Ajouter les objets sélectionnés en tant que membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Supprimer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Retirer tous les objets sélectionnés de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Déplacer vers le bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Déplacer les membres sélectionnés vers le bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3277,36 +3282,36 @@
 msgstr "Supprimer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Supprimer le membre de cette relation de l'entrée actuelle de la table"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Télécharger les membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Membres : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editeur de relation : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Il y a eu des conflits pendant l’importation."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Erreur d'analyse de la réponse du serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Impossible de se connecter au serveur."
@@ -3320,10 +3325,11 @@
 msgstr "Supprimer la relation sélectionnée"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relations"
@@ -3522,5 +3528,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Lieux/endroits"
@@ -3567,21 +3573,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "type"
@@ -3636,10 +3642,7 @@
 "faire glisser."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Carte"
@@ -3793,4 +3796,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3897,5 +3901,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3960,19 +3964,34 @@
 "estimer leur horodatage ont été omis."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "en dehors de la zone téléchargée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} est consistué de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} supprimés)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "usage"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3980,21 +3999,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4449,5 +4468,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4532,4 +4551,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4613,7 +4634,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4626,7 +4644,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4642,10 +4667,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4814,5 +4839,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4846,7 +4873,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4930,4 +4957,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4980,4 +5015,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4986,7 +5027,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4995,15 +5033,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -5028,129 +5055,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Nom"
@@ -5199,12 +5228,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Charger toutes les dalles"
+msgstr "Fichiers locaux"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zone"
+msgstr "Aucun"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5233,45 +5260,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Voiture"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Vélos"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5279,25 +5296,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Piétons"
@@ -5347,7 +5369,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Dessiner des lignes entre les points GPS bruts."
+msgstr "Dessine des lignes entre les points GPS bruts"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5997,6 +6018,6 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr ""
@@ -6004,5 +6025,5 @@
 "manquantes."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Préparation des données..."
@@ -6014,25 +6035,75 @@
 "un document gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Ouverture de la révision..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Fermeture de la révision..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Aucun changement à envoyer."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Préparation en cours..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Envoi en cours..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Erreur d'analyse de la réponse du serveur"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Hôte inconnu"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Mot de passe ou nom d’utilisateur incorrect."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 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:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 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:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Entrer le mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Identifiant"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -6043,44 +6114,52 @@
 msgstr "Erreur pendant l’analyse syntaxique."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Version inconnue"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Version inconnue"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Élément <nd> trouvé sur un non-chemin."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> n’a pas de ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Élément <member> trouvé dans une non-relation."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Champ <member> incomplet avec ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "L’objet avec l’id=0 est illégal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Attribut requis manquant \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Chemin ignoré car il contient un nœud inexistant : {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Préparation des données de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "id du nœud mal formé"
@@ -6090,5 +6169,5 @@
 msgstr "Contact du serveur..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -6097,5 +6176,5 @@
 "Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6105,55 +6184,8 @@
 "charger, et/ou attendez un peu avant de recommencer."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Fournissez un bref commentaire aux changements que vous envoyez :"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Commentaire sur cette déposition"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} restant(s). Chargement de {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Une erreur est survenue : {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Ouverture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Le serveur ne supporte pas les révisions"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Hôte inconnu"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Préparation en cours..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Envoi en cours..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Fermeture de la révision..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6327,6 +6359,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "inconnu"
@@ -6516,7 +6548,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Créer des surfaces"
+msgstr "Créer un reseau de voies"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6525,17 +6556,18 @@
 "in common"
 msgstr ""
+"Forme une grille de chemins à partir de deux voies existantes ayant un seul "
+"point en commun."
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Séléctionnez deux voies ayant un même noeud en commun"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Sélectionner deux chemins avec un seul nœud en commun"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Créer des surfaces"
+msgstr "Créer un reseau de voies"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6559,5 +6591,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Description"
@@ -7645,5 +7677,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:222
 msgid "Grid layer:"
-msgstr "Calque de la grille:"
+msgstr "Calque de la grille :"
 
 #: ../plugins/grid/src/grid/GridPlugin.java:27
@@ -7854,7 +7886,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "eau"
@@ -8166,5 +8198,5 @@
 msgstr "Boucle de téléchargement OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Afficher les problèmes d'OpenStreetBugs"
@@ -8184,4 +8216,11 @@
 msgstr "Avertissement"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Une erreur est survenue : {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8211,35 +8250,38 @@
 "donénes depuis OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Ajouter un commentaire"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Entrez votre commentaire"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Marquer comme fait"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Marquer ce problème comme \"fait\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Fermé?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Nouveau problème"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Créer un problème"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Décrire le problème précisément"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Créer un problème"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8268,5 +8310,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8276,9 +8318,9 @@
 "carte des Préférences."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "options osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Exécutable Firefox"
@@ -8352,129 +8394,113 @@
 "suivante :"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Navigation"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr "Calcul d'itinéraire"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Rien"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "Clickez pour ajouter des noeuds routiers."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Cliquer pour insérer un nouveau nœud."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "Cliquer et glisser pour déplacer les nœuds du chemin."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Cliquer pour insérer un nouveau nœud."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "Clickez pour ajouter des noeuds routiers."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "Ouvrir une liste des nœuds de routage"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "Suppression des nœuds en doublon..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Ouvrir une liste de toutes les relations."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Station"
+msgid "Add routing layer"
+msgstr "Ajouter un nouveau calque"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "rouge"
+msgstr "Critère"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Magasin de chaussures"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "Le plus court"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Accélérer"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "Le plus rapide"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Inverser les maisons mitoyennes"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr "Inverser l'itinéraire"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Itinéraire de ferry"
+msgstr "Suprimer l'itinéraire"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Préférences du greffon WMS"
+msgstr "Préférences du greffon de navigation"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Configurer les sites de greffon."
+msgstr "Configurer les préférences de navigation"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Sortie routière"
+msgstr "Type de route"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Vitesse max (km/h)"
+msgstr "Vitesse (Km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Hauteur"
+msgstr "Poids"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "Entrez les valeurs du poids"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Carte glissante"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Charger la tuile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Montrer le status de la dalle"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Demander une mise à jour"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Charger toutes les dalles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Augmenter le zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Diminuer le zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "image non chargée"
@@ -8486,5 +8512,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
 msgid "autoload tiles"
-msgstr "chargement auo. des tuiles"
+msgstr "chargement automatique des tuiles"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
@@ -8497,34 +8523,34 @@
 msgstr "Paramètres du greffon SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Sources des dalles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
-msgstr "Zoom auto. : "
+msgstr "Zoom automatique : "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr "Chargement automatique des tuiles : "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr "Chargement auto. des tuiles : "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
 msgstr "Niveau de zoom maxi. : "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
-msgstr "Atténuer le l'arrière plan : "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+msgstr "Pâlissement  graduel de l'arrière plan : "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "Erreur lors du chargement des metadata"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "demandé : {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "Error lors de la mise à jour"
@@ -8539,5 +8565,5 @@
 msgstr "Sauvegarder les données capturées vers un fichier à chaque minute"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8593,7 +8619,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Éditer un état"
+msgstr "Modifier les étiquettes"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8601,66 +8626,58 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Lance la fenêtre de l'éditeur d'étiquette"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "Greffon d'édition des étiquettes JOSM"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "rien"
+msgstr "(aucun)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "surligner"
+msgstr "Surligner"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "multi"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr "<multiple>"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Modifier les propriétés de {0} objet maximum."
-msgstr[1] "Modifier les propriétés de {0} objets maximum."
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] "Enlever des clés anciennes d'au maximum {0} objet"
+msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Modifier les propriétés de {0} objet maximum."
-msgstr[1] "Modifier les propriétés de {0} objets maximum."
+msgstr[0] "Mise à jour de propriétés d'au maximum {0} objet"
+msgstr[1] "Mise à jour de propriétés d'au maximum {0} objets"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "route"
+msgstr "Groupe"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Ruisseau"
+msgstr "Elément"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Chercher"
+msgstr "Rechercher : "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Fichier"
+msgstr "Filtrez"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Voiture"
+msgstr "Effacer"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8748,5 +8765,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Nom de la rue"
@@ -8847,24 +8864,22 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Noeuds ajoutés sur toutes les intersections"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
+"Supprimer les chemins qui ne font pas partie d'un multipolygone intérieur"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relation"
+msgstr "Corriger les relations"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Joindre zones superposées"
+msgstr "Ai fusionné une aire superposée sur elle même"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Joindre zones superposées"
+msgstr "Ai fusionné des aires superposées"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8877,31 +8892,26 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Fusionner les conflits."
+msgstr "Corriger les conflits d'étiquettes"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Supprimer de la relation"
+msgstr "Élément supprimé des relations"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Aires jointes: enlever les voies courtes"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Chemins non fermés"
+msgstr "Chemin fermé"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Supprimer la photo du calque"
+msgstr "Supprime les étiquettes des chemins internes"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Jonction autoroutière"
+msgstr "Fonction de jointure des zones"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9515,4 +9525,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9594,7 +9610,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "bâtiment"
@@ -9608,5 +9624,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "zone"
@@ -9917,4 +9933,9 @@
 msgstr "impossible d’obtenir un flux audio depuis l’URL"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9948,7 +9969,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Créer des surfaces"
+msgstr "Créer un reseau de voies"
 
 #. Plugin DirectUpload
@@ -10063,21 +10083,28 @@
 "SVG."
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "L'apparence et le ressenti du superbe JGoodies Plastic"
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr "Permet aux autres applications d'envoyer des commandes à JOSM."
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Fournit des capacités de routage/calcul d'itinéraire"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -10088,15 +10115,17 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d'ajouter des marqueurs/points sur les positions GPS courantes."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
+"Fourni une fenêtre permettant de modifier les étiquettes sous forme de "
+"tableur."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -10109,15 +10138,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr "Charger des fichiers TCX directement depuis JOSM."
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr "Crée des maisons mytoyennes depuis des blocs entiers."
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -10129,5 +10158,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -10138,5 +10167,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -10148,5 +10177,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10238,5 +10267,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Référence"
@@ -10291,7 +10320,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Calque"
@@ -10334,5 +10363,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Vitesse max (km/h)"
@@ -10380,5 +10409,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Sens unique"
@@ -10434,5 +10463,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Pont"
@@ -10482,5 +10511,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -10527,5 +10556,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Découpe"
@@ -10572,5 +10601,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Remblai"
@@ -10728,6 +10757,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Largeur (mètres)"
@@ -10776,5 +10805,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Revêtement"
@@ -10806,7 +10835,7 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
-msgstr "pavé"
+msgstr "avec revêtement"
 
 #: build/trans_presets.java:228 build/trans_presets.java:246
@@ -10815,7 +10844,7 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
-msgstr "non pavé"
+msgstr "sans revêtement"
 
 #: build/trans_presets.java:228 build/trans_presets.java:246
@@ -10827,5 +10856,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "pavés"
@@ -10977,5 +11006,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10996,6 +11025,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "oui"
@@ -11139,7 +11168,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "non"
@@ -11153,73 +11182,63 @@
 msgstr "Poids-lourds"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Cheval"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motos"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Voitures"
@@ -11294,130 +11313,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Type"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11425,5 +11332,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11431,11 +11338,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11443,5 +11344,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11449,5 +11350,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11455,5 +11356,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11461,6 +11362,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11479,6 +11386,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "motorway"
@@ -11504,6 +11411,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "voie rapide"
@@ -11529,6 +11436,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "primary"
@@ -11554,6 +11461,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "secondary"
@@ -11567,5 +11474,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "tertiary"
@@ -11583,5 +11490,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "residential"
@@ -11599,5 +11506,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "service"
@@ -11624,6 +11531,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "construction"
@@ -11664,6 +11571,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11674,5 +11580,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "roundabout"
@@ -12016,14 +11922,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Compagnie"
@@ -12048,20 +11954,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "non contrôlé"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "feux tricolores"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "île"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "unmarked"
@@ -12069,5 +11975,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "Traversée à cheval"
@@ -12076,5 +11982,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "Traversée à vélo"
@@ -12084,5 +11990,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "Aide à la traversée (personne)"
@@ -12231,10 +12137,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Altitude"
@@ -12247,29 +12154,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Échalier"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Modifier un échalier"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Plot"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Modifier une bitte d'amarrage"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12278,7 +12174,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12287,235 +12186,223 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Trafic autorisé:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr "Barrière pour cycles"
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Ruines"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Grille dans le sol"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Modifier une grille dans le sol"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "Entrée de voie de bus (Allemagne)"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr "Pointes"
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr "Modifier pointes"
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Péage"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Éditer un péage"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Douane"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Modifier douane"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Haie"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Barrière"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Mur"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Rempart"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Mur de soutènement"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Entrée"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Editez une entrée"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "Porte"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "Editer une porte"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "Barrière"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "Modifier une barrière"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Porte de clôture"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Modifier une Porte de clôture"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Barrière mobile"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Modifier une barrière mobile"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "Portillon à chicane"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
 msgstr "Modifier un Portillon à chicane"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Porte de clôture"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Modifier une Porte de clôture"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Plot"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Modifier une bitte d'amarrage"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Pont-levis"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Modifier un pont-levis"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "Entrée de voie de bus (Allemagne)"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Grille dans le sol"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Modifier une grille dans le sol"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr "Pointes"
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr "Modifier pointes"
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Herse"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Modifier une herse"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "Porte"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "Editer une porte"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr "Barrière"
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr "Modifier une barrière"
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Échalier"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Modifier un échalier"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Écluse"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Modifier une écluse"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Barrière mobile"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Modifier une barrière mobile"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr "Barrière pour cycles"
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Haie"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Barrière"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Ruines"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Mur"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Rempart"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Mur de soutènement"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Péage"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Éditer un péage"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Douane"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Modifier douane"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Entrée"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Editez une entrée"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Eau"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Source"
@@ -12523,5 +12410,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Éditer une source"
@@ -12529,5 +12416,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Canal d’évacuation"
@@ -12535,10 +12422,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Éditer un canal d’évacuation"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Ruisseau"
@@ -12546,10 +12433,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Éditer un ruisseau"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Canal"
@@ -12557,10 +12444,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Éditer un canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Rivière"
@@ -12570,5 +12457,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Éditer une rivière"
@@ -12576,15 +12463,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Éditer de l’eau"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Terre"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Editez un terrain"
@@ -12592,15 +12479,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Bassin"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Éditer un bassin"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Bassin de retenue"
@@ -12608,15 +12495,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Éditer un bassin de retenue"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Réservoir couvert"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Éditer un réservoir couvert"
@@ -12624,5 +12511,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Lit de rivière"
@@ -12631,10 +12518,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Modifier lit de rivière"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Zone inondable"
@@ -12645,56 +12532,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Modifier zone inondable"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "marécages"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "tourbière"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "marais"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "roselière"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "marais salant"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "étendue vaseuse"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Terrain boueux/vase"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Éditer un terrain boueux"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Plage"
@@ -12702,20 +12589,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Éditer une plage"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Baie"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Éditer une baie"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Falaise"
@@ -12723,10 +12610,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Éditer une falaise"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Ligne côtière"
@@ -12734,5 +12621,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Éditer une ligne côtière"
@@ -12740,5 +12627,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Itinéraire de ferry"
@@ -12746,5 +12633,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Éditer un itinéraire de ferry"
@@ -12753,5 +12640,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Chantier naval"
@@ -12759,10 +12646,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Éditer un chantier naval"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Dock"
@@ -12770,5 +12657,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Éditer un dock"
@@ -12776,5 +12663,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Barrage"
@@ -12782,15 +12669,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Éditer un barrage"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Voie navigable"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Écluse"
@@ -12799,5 +12686,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Petit barrage"
@@ -12805,20 +12692,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Éditer une écluse"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Cascade"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Éditer une cascade"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Point de retournement"
@@ -12827,15 +12714,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Éditer une marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Jetée/Ponton"
@@ -12843,10 +12730,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Modifier jetée/ponton"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Terminal de Ferry"
@@ -12854,10 +12741,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Editer un terminal de Ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Slipway"
@@ -12867,5 +12754,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Éditer un plan incliné"
@@ -12873,10 +12760,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Voie ferrée"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Rail"
@@ -12884,5 +12771,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Éditer des rails"
@@ -12912,8 +12799,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Types optionels"
@@ -12927,35 +12814,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "triage"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "voie de garage"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "embranchement"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Voie ferrée étroite"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Éditer une voie ferrée étroite"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Monorail"
@@ -12963,45 +12850,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Éditer un monorail"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Préservé"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Éditer une voie ferrée touristique"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Rails légers"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Éditer des rails légers"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Voie souterraine"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Éditer un métro"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Tram"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Éditer un tram"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Voie de guidage de bus"
@@ -13009,5 +12896,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Éditer une voie de guidage de bus"
@@ -13016,14 +12903,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Voie désaffectée"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Éditer une voie désaffectée"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Voie abandonnée"
@@ -13032,5 +12919,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Passage à niveau"
@@ -13039,5 +12926,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Passage piéton sur voie ferrée"
@@ -13047,5 +12934,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr "Type de passage"
@@ -13053,5 +12940,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Plaque tournante"
@@ -13060,10 +12947,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Transports aériens par câble"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Télésiège"
@@ -13071,10 +12958,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Éditer un télésiège"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Téléski"
@@ -13082,10 +12969,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Éditer un téléski"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Télécabine"
@@ -13093,24 +12980,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Éditer un télécabine"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Editer un Golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Station"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Éditer la station"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Station service"
@@ -13120,5 +13020,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Modifier station essence"
@@ -13134,5 +13034,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -13142,5 +13042,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Éditer un parking"
@@ -13148,40 +13048,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Capacité"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "surface"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "parking (bâtiment)"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "souterrain"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "Automobiles en libre service"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Espaces pour handicapés"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
-msgstr "Péages"
+msgstr "Péage/Forfait"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Lavage"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Editez un espace de lavage de voitures"
@@ -13189,5 +13090,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Concession/Réparation"
@@ -13195,15 +13096,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Éditer une concession/réparation"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Réparer"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Editez un garagiste"
@@ -13211,5 +13112,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Location"
@@ -13218,10 +13119,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Éditer une location de voiture"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Partage"
@@ -13229,5 +13130,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Éditer un covoiturage"
@@ -13235,5 +13136,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Éditer un parking à vélo"
@@ -13242,5 +13143,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Éditer une location de vélos"
@@ -13249,15 +13150,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Éditer un magasin de vélo"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Transport public"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "Référence UIC"
@@ -13265,5 +13166,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Halte ferroviaire"
@@ -13271,5 +13172,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Editez un arrêt"
@@ -13277,5 +13178,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Arrêt de tram"
@@ -13284,5 +13185,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Éditer un arrêt de tram"
@@ -13290,5 +13191,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Quai"
@@ -13297,5 +13198,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Éditer un quai"
@@ -13307,5 +13208,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "Référence (numéro de voie)"
@@ -13313,10 +13214,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Surface"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Bouche de métro"
@@ -13325,10 +13226,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Éditer une bouche de métro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Chaise roulante"
@@ -13337,5 +13238,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Gare routière"
@@ -13344,5 +13245,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Éditer une gare routière"
@@ -13350,5 +13251,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Arrêt de bus"
@@ -13358,5 +13259,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Éditer un arrêt de bus"
@@ -13364,10 +13265,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Plateforme de bus"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Éditer une plateforme de bus"
@@ -13375,5 +13276,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13381,5 +13282,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Editez une station de taxi"
@@ -13387,5 +13288,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Aéroport"
@@ -13393,15 +13294,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Modifier aéroport"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13410,5 +13311,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Hôtel"
@@ -13420,5 +13321,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hôtel"
@@ -13427,15 +13328,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Éditer un hôtel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Étoiles"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Môtel"
@@ -13443,20 +13344,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Éditer un motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Chambre d’hôte"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Éditer une chambre d’hôte"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Châlet"
@@ -13464,10 +13365,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Editez un châlet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Hôtel"
@@ -13475,30 +13376,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Éditer une auberge de jeunesse"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Chalet"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Modifier chalet"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Site pour caravane"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Éditer un  site pour caravane"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Camping"
@@ -13506,10 +13407,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Éditer un camping"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Nourriture & boissons"
@@ -13520,5 +13421,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -13526,5 +13427,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Éditer un restaurant"
@@ -13532,5 +13433,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -13538,61 +13439,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italien"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "chinois"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "greque"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "allemand"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indien"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "régional"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "thaïlandais"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexicain"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japonais"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -13600,9 +13501,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Éditer un fast food"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Café"
@@ -13610,10 +13511,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Editez un café"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Bar"
@@ -13621,20 +13522,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Éditer un biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "Bar"
@@ -13642,10 +13543,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "Modifier Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -13653,20 +13554,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Éditer une boîte de nuit"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Editez une attraction"
@@ -13675,11 +13576,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "Musée"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "Éditer un musée"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "Zoo"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "Editez un Zoo"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "Point de vue"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "Éditer un point de vue"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Tour de surveillance"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "Parc d’attraction"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "Éditer un parc d’attraction"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "Oeuvre d’art"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "Éditer une oeuvre d’art"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "Office du Tourisme"
@@ -13687,143 +13649,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
 msgstr "Modifier Office du Tourisme"
 
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "Musée"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "Éditer un musée"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "Zoo"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "Editez un Zoo"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "Point de vue"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "Éditer un point de vue"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Tour de surveillance"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "Parc d’attraction"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "Éditer un parc d’attraction"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "Oeuvre d’art"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "Éditer une oeuvre d’art"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr "Type de carte"
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr "carte"
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr "carte de la ville"
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr "carte de randonnée"
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr "carte de randonnée cycliste"
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr "Description détaillée"
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr "Bureau d'informations"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr "Type de bureau"
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr "tableau"
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr "histoire"
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr "nature"
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr "faune"
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr "Panneau de direction (randonnée)"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr "Type de carte"
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr "carte"
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr "carte de la ville"
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr "carte de randonnée"
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr "carte de randonnée cycliste"
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr "Description détaillée"
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr "Bureau d'informations"
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr "Type de bureau"
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr "tableau"
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr "histoire"
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr "nature"
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr "faune"
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr "Autre points d'information"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Abri"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Éditer un abri"
@@ -13831,25 +13733,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Âtre"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Site de pique-nique"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Éditer un site de pique-nique"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Château"
@@ -13858,20 +13760,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Éditer un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Éditer des ruines"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -13880,20 +13782,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Éditer un site archéologique"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Lieu de bataille"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Éditer un lieu de bataille"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Monument commémoratif"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Editez un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Mémorial"
@@ -13901,56 +13815,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Éditer un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Lieu de bataille"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Éditer un lieu de bataille"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Éditer une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Éditer une Chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Éditer un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Aire de jeux"
@@ -13958,15 +13861,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Éditer une zone de jeu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Éditer un lieu de pêche"
@@ -13974,15 +13877,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stade"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Éditer un stade"
@@ -13996,6 +13899,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "Selectionner un sport:"
@@ -14074,4 +13977,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14363,28 +14274,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "sport"
@@ -14394,227 +14306,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "tir à l'arc"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "boules"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "cricket_nets"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "dog_racing"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "skate"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Éditer un centre sportif"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Éditer un terrain de sport"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Éditer un circuit"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Parcours de Golf"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Éditer un terrain de golf"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Éditer un minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Editer Multi"
@@ -14653,191 +14565,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "Terrain"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "Éditer un Bowling"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Éditer athlétisme"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Éditer tir à l’arc"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Éditer escalade"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Éditer canoë"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Cyclisme"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Éditer cyclisme"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Éditer course de chiens"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Equitation"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Éditer sports équestres"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Éditer course de chevaux"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Éditer gymnastique"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Sports mécaniques"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Éditer sports mécaniques"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Skate"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Éditer patin à roulettes"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Éditer skateboard"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Natation"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Éditer natation"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Ski"
@@ -14845,56 +14757,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Type de piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "de descente"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "rouge"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "noire"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "Tirer"
@@ -14902,178 +14816,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Éditer tir sportif"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Sport de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Éditer football australien"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Éditer baseball"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Éditer basketball"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Editer un Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Boules"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Éditer boules"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Boules"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Éditer bowls"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Éditer cricket"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Éditer filets de cricket"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Éditer croquet"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Éditer hockey"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Éditer pelote basque"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "Sports de raquette"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Éditer sports de raquette"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Éditer rugby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Éditer tennis de table"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Éditer tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Bâtiments"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Bâtiment"
@@ -15081,5 +14995,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Bâtiment officiel"
@@ -15087,10 +15001,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Éditer un bâtiment officiel"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Mairie"
@@ -15098,10 +15012,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Éditer une mairie"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Ambassade"
@@ -15109,10 +15023,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Editer une ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -15121,10 +15035,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Éditer un palais de justice"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Prison"
@@ -15133,10 +15047,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Éditer une prison"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Poste de police"
@@ -15146,10 +15060,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Éditer un poste de police"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -15158,10 +15072,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Éditer une caserne de pompiers"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -15169,5 +15083,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Éditer un bureau de poste"
@@ -15175,15 +15089,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Éditer un jardin d’enfants"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "École"
@@ -15191,10 +15105,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Éditer une école"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Université"
@@ -15202,10 +15116,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Éditer une université"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -15213,5 +15127,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Éditer un établissement d’enseignement supérieur"
@@ -15219,5 +15133,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Cinema"
@@ -15226,10 +15140,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Éditer un cinéma"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Bibliothèque"
@@ -15238,10 +15152,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Éditer une bibliothèque"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -15249,10 +15163,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Éditer un centre artistique"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Théâtre"
@@ -15261,10 +15175,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Éditer un théatre"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -15274,5 +15188,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Éditer un lieu de culte"
@@ -15281,6 +15195,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Religion"
@@ -15289,66 +15203,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "unitarianist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Dénomination"
@@ -15357,81 +15272,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "catholique"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Adresses"
@@ -15440,5 +15355,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Editez l'adresse"
@@ -15446,5 +15361,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -15452,20 +15367,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -15473,5 +15388,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -15480,5 +15395,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Éditer l’interpolation d’adresse"
@@ -15486,67 +15401,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Schéma de numérotation"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "all"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "athletics"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Usine"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Éditer une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Structure de hauteur"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Éditer une structure de hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Éditer un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Éditer un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Phare"
@@ -15554,10 +15474,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Éditer un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -15565,10 +15485,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Éditer un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -15576,10 +15496,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Éditer un pipeline"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -15589,10 +15509,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Éditer une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Grue"
@@ -15600,21 +15520,21 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Éditer une grue permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
-msgstr "Signal lumineux"
+msgstr "Balise signalétique"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
-msgstr "Éditer un signal lumineux"
+msgstr "Editer balise signalétique"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -15622,10 +15542,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Éditer un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -15633,5 +15553,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Éditer une caméra de surveillance"
@@ -15639,5 +15559,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -15647,39 +15567,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Éditer une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "photovoltaïque"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "gaz"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Station électrique"
@@ -15688,10 +15608,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Editez une station électrique"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -15700,5 +15620,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Modifier transformateur électrique"
@@ -15706,10 +15626,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "Champ de vision"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -15720,5 +15640,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Éditer un pylône électrique"
@@ -15726,5 +15646,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Ligne de courant"
@@ -15733,25 +15653,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Editez une ligne de courant"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Tension"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Toilettes"
@@ -15759,25 +15679,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Numéro de référence"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Charge"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Téléphone"
@@ -15786,5 +15701,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Éditer un téléphone"
@@ -15792,5 +15707,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Pièces"
@@ -15798,5 +15713,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Billets"
@@ -15804,5 +15719,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Cartes de crédit temporaire"
@@ -15810,5 +15725,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -15816,15 +15731,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Cartes de crédits"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Recyclage"
@@ -15833,5 +15748,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Éditer un point de recylcage"
@@ -15839,35 +15754,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Ferrailleur"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Banc"
@@ -15876,20 +15791,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Masquer"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Verrouiller"
@@ -15897,22 +15812,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "à moitié"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "complet"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Fontaine"
@@ -15921,10 +15836,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Éditer une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Eau potable"
@@ -15933,10 +15848,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Éditer un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Tour d’abandon (nouveau né)"
@@ -15944,25 +15859,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Éditer un tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Magasins"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Éditer un supermarché"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Commerce de proximité"
@@ -15970,10 +15885,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Éditer une épicerie"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -15981,10 +15896,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Éditer un kiosque à journaux"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -15992,5 +15907,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Éditer un distributeur automatique"
@@ -15998,88 +15913,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Boucherie"
@@ -16087,10 +16002,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Éditer une boucherie"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Boulanger"
@@ -16098,10 +16013,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Éditer une boulangerie"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Fleuriste"
@@ -16109,70 +16024,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Modifier fleuriste"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "Boutique bio"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Modifier boutique bio"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "École"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Modifier magasin de chaussures"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Mofiifer boutique de boissons"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Informatique"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Modifier magasin informatique"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Modifier magasin d’électronique"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Modifier boutique Hi-Fi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Modifier magasin d’ameublement"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -16180,10 +16109,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Modifier jardinerie"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -16191,10 +16120,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "Modifier quincaillerie"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Magasin de bricolage"
@@ -16202,60 +16131,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "Éditer un magasin de bricolage"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Modifier papeterie"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Coiffeur"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Editez un Coiffeur"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Magasin de chaussures"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Modifier magasin de chaussures"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Jouets"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Modifier magasin de jouets"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "Modifier vidéoclub"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -16263,10 +16192,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Éditer un pressing"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Laverie libre-service"
@@ -16274,10 +16203,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Éditer une laverie"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Magasin de sports d’extérieur"
@@ -16285,35 +16214,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Éditer un magasin de sports d’extérieur"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "Magasin de sport"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Sport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Modifier magasin de sport"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "Opticien"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Modifier opticien"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Banque"
@@ -16321,5 +16252,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Editez une banque"
@@ -16327,10 +16258,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -16338,5 +16269,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Éditer un bureau de change"
@@ -16344,15 +16275,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Éditer un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Médecin"
@@ -16360,20 +16291,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Modifier Médecin"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Dentiste"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Editez le Dentiste"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -16381,5 +16312,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Éditer pharmacie"
@@ -16387,10 +16318,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "Dispensaire"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Hôpital"
@@ -16398,10 +16329,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Éditer hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -16410,5 +16341,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "Éditer point d’accès d’urgence"
@@ -16417,20 +16348,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890"
@@ -16438,5 +16369,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Vétérinaire"
@@ -16445,25 +16376,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Editez un Vétérinaire"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Éditer un continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Pays"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Éditer un pays"
@@ -16471,45 +16402,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Département"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Éditer un état"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Région"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Éditer une région"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Éditer un comté/canton"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Editez la ville"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Ville 10 000 à 100 000 habitants"
@@ -16517,10 +16449,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Editez la ville"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Banlieue"
@@ -16528,30 +16460,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Éditer une banlieue"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Village"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Éditer un village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Éditer un hameau"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -16559,10 +16492,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Éditer un lieu-dit"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "île"
@@ -16570,5 +16503,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Éditer une île"
@@ -16576,5 +16509,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -16582,10 +16515,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Éditer une entrée de grotte"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Sommet"
@@ -16593,10 +16526,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Modifier un pic"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Glacier"
@@ -16604,10 +16537,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Éditer un glacier"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Volcan"
@@ -16615,70 +16548,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Éditer un volcan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Nationale"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Éditer une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Éditer une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Civile"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Éditer une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr "Politique"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Éditer une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr "Parc national"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Éditer les frontières d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Arbre"
@@ -16687,15 +16620,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Éditer un arbre isolé"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Bois"
@@ -16704,5 +16637,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Éditer un bois"
@@ -16710,17 +16643,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Forêt"
@@ -16729,19 +16662,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Éditer une forêt"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Éditer une réserve naturelle"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Zone d’éboulements"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Éditer une zone d’éboulements"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Broussailles"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Éditer des broussailles"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Talus"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Éditer un talus"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Lande"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Éditer une lande"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Bâtiments de ferme"
@@ -16750,70 +16727,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Éditer des bâtiments de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Terrains de ferme"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Éditer des terrains de ferme"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Editer prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Éditer une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Éditer des jardins familiaux"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Jardin"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Éditer un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Herbe"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Éditer de l’herbe"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "Zone publique herborée"
@@ -16821,10 +16799,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr "Éditer une zone publique herborée"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Espace commun"
@@ -16832,20 +16810,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Éditer un espace commun"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Parc"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Editez un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -16853,5 +16831,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Éditer une aire de jeux"
@@ -16859,15 +16837,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Éditer une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -16875,9 +16853,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Éditer un petit cimetière"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -16885,39 +16863,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Éditer un cimetière"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Zone commerciale"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Éditer une zone commerciale"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Bureaux"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Éditer des bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Éditer une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -16925,114 +16903,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Éditer une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Militaire"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Éditer un terrain militaire"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Zone de construction"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Éditer un chantier"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Terrain en friche"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Éditer un terrain en friche"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Espace vert"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Éditer une nouvelle zone de construction"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Zone de construction"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Éditer un chantier"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Éditer une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Éditer une carrière"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Militaire"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Éditer un terrain militaire"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Zone d’éboulements"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Éditer une zone d’éboulements"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Broussailles"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Éditer des broussailles"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Talus"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Éditer un talus"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Lande"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Éditer une lande"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Multypoligone"
@@ -17042,5 +16977,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -17049,10 +16984,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "segment extérieur"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -17060,5 +16995,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -17067,5 +17002,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -17073,34 +17008,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "Interdiction d'aller tout droit"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "Obligation d'aller tout droit"
@@ -17109,15 +17044,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "chemin d'origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 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:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "chemin destination"
@@ -17125,5 +17060,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Route"
@@ -17132,5 +17067,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "Modifier une route"
@@ -17138,5 +17073,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Type de route"
@@ -17208,24 +17143,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "vélo/bicyclette"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "ski"
@@ -17270,4 +17205,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17277,19 +17215,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "piéton"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "randonnée"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "détour"
@@ -17303,10 +17242,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "Description du symbole"
@@ -17314,26 +17253,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Couleur (hexa)"
@@ -17342,30 +17281,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "segment de route"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "point d'arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "point d'arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "point d'arrêt précédent"
@@ -17549,4 +17488,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17558,4 +17604,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17657,11 +17712,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "déprécié"
@@ -17703,7 +17760,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "cheval"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Barrières"
 
 #. color tertiary
@@ -17739,6 +18011,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "rue"
@@ -17794,7 +18066,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "piste"
@@ -17841,108 +18113,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "voie ferrée"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viaduc"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17959,4 +18144,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "service"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17966,4 +18157,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Gué"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17980,8 +18177,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "zone de manœuvre"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "Point d’accès d’urgence"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17993,5 +18204,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "berge"
@@ -18005,5 +18216,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "ruisseau"
@@ -18017,5 +18228,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "dock"
@@ -18043,5 +18254,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "aqueduc"
@@ -18056,4 +18267,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18093,5 +18305,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18208,12 +18420,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "artificiel"
@@ -18259,5 +18472,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18275,7 +18488,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr "point ferroviaire"
@@ -18298,10 +18511,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr "Autre voie ferrée"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr "passage au dessus d'une voie ferrée"
@@ -18331,6 +18544,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr "ligne ferroviaire touristique"
@@ -18375,6 +18588,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "piste d'atterrissage"
@@ -18388,5 +18601,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminal"
@@ -18408,5 +18621,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "piste (sombre)"
@@ -18420,5 +18633,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "piste (claire)"
@@ -18441,4 +18654,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18458,4 +18679,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "couloir aérien"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18464,23 +18691,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "couloir aérien"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "piste bleue"
@@ -18494,5 +18708,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "piste rouge"
@@ -18506,5 +18721,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "piste noire"
@@ -18517,6 +18733,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "hors piste"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "hors piste"
@@ -18530,5 +18761,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "piste verte"
@@ -18559,4 +18791,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18591,4 +18831,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18601,8 +18865,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "alimentation électrique"
@@ -18615,5 +18881,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "appontement/jetée"
@@ -18627,5 +18896,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "oléoduc"
@@ -18753,12 +19022,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "loisir"
@@ -18772,5 +19041,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "marina"
@@ -18842,8 +19111,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "aménité"
@@ -18879,4 +19148,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18936,11 +19213,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "équipement de traffic"
@@ -19079,6 +19356,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19305,22 +19603,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "équipement lumineux"
@@ -19352,6 +19650,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "eau (claire)"
@@ -19387,4 +19685,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19404,7 +19710,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "santé"
@@ -19498,4 +19805,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19698,4 +20013,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19729,28 +20060,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "magasin"
@@ -19804,4 +20137,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19814,8 +20155,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hôtel"
@@ -19870,4 +20211,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19964,9 +20306,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "tourisme"
@@ -20038,8 +20380,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "patrimoine"
@@ -20109,9 +20451,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "espace vert"
@@ -20125,5 +20467,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "carrière"
@@ -20137,5 +20479,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "décharge"
@@ -20157,5 +20499,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "bassin"
@@ -20169,5 +20511,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "forêt"
@@ -20181,5 +20523,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "bâtiments de ferme"
@@ -20202,5 +20544,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "commerce de proximité"
@@ -20214,5 +20556,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "zone industrielle"
@@ -20226,5 +20568,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "terrain en friche"
@@ -20238,5 +20580,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "espace vert"
@@ -20250,5 +20592,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "zone ferroviaire"
@@ -20305,7 +20647,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "zone militaire"
@@ -20319,5 +20661,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "cimetière"
@@ -20330,5 +20672,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "sommet"
@@ -20343,5 +20685,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "glacier"
@@ -20355,5 +20697,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "volcan"
@@ -20368,4 +20710,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20407,7 +20750,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "nature"
@@ -20421,5 +20765,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "broussailles"
@@ -20433,5 +20777,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "lande/bruyère"
@@ -20445,5 +20789,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "bois"
@@ -20457,5 +20801,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "terrain boueux/vase"
@@ -20469,5 +20813,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "plage"
@@ -20545,8 +20889,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "route"
@@ -20594,7 +20938,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "frontière"
@@ -20736,10 +21080,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "lieu"
@@ -20780,6 +21124,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "adresse"
@@ -21061,491 +21412,51 @@
 msgstr "Rues Geofabrik.de de Rhénanie-du-Nord-Westphalie"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "Si votre GPS dessine des points trop espacés, sélectionnez ceci pour "
-#~ "tracer des lignes entre les points."
-
-#~ msgid "Navigate"
-#~ msgstr "Naviguer"
-
-#~ msgid "Navigator"
-#~ msgstr "Navigateur"
-
-#~ msgid "Set start/end for routing. Middle mouse button to reset."
-#~ msgstr ""
-#~ "Régler le début et la fin pour le calcul d’itinéraire automatique. Bouton "
-#~ "du milieu pour remettre à zéro."
-
-#~ msgid "Reset Graph"
-#~ msgstr "Remettre à zéro le graphique"
-
-#~ msgid "Provides navigation/autorouting functionality"
-#~ msgstr "Fourni une fonction de navigation routière"
-
-#~ msgid "Java OpenStreetMap Editor Version {0}"
-#~ msgstr "Java OpenStreetMap Editor Version {0}"
-
-#~ msgid "Error while exporting {0}"
-#~ msgstr "Erreur à l’export {0}"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Veuillez sélectionner un élément de la liste des conflits."
-
-#~ msgid "Please select a color."
-#~ msgstr "Veuillez sélectionner une couleur."
-
-#~ msgid "NullPointerException. Possible some missing tags."
-#~ msgstr "NullPointerException.·Certains tags peuvent manquer."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bound."
-#~ msgstr "Erreur de données : La valeur de latitude \"{0}\" est hors limite."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bound."
-#~ msgstr "Erreur de données : La valeur de longitude \"{0}\" est hors limite."
-
-#~ msgid "Remove \"{0}\" for"
-#~ msgstr "Supprime \"{0}\" pour"
-
-#~ msgid "Set {0}={1} for"
-#~ msgstr "Affecte {0}={1} pour"
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Ne pas lancer en plein écran"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Nouveautés sur JOSM"
-
-#~ msgid "Move the selected nodes onto a line."
-#~ msgstr "Déplacer les nœuds sélectionnés en ligne"
-
-#~ msgid "Download from OSM ..."
-#~ msgstr "Téléchargement depuis OSM..."
-
-#~ msgid "Export to GPX ..."
-#~ msgstr "Exporter au format GPX..."
-
-#~ msgid "OSM History Information"
-#~ msgstr "Historique d'information OSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Cliquer pour ajouter un nouveau chemin vers un nœud existant."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Cliquer pour établir une connexion vers le nœud existant."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Cliquer pour insérer un nœud et créer un nouveau chemin."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Cliquer pour insérer un nouveau nœud et établir une connexion."
-
-#~ msgid "Open ..."
+#, fuzzy
+#~ msgid "..."
 #~ msgstr "Ouvrir..."
 
-#~ msgid "Preferences ..."
-#~ msgstr "Préférences ..."
-
-#~ msgid "Save as ..."
-#~ msgstr "Sauvegarder sous..."
-
-#~ msgid "Search ..."
-#~ msgstr "Rechercher ..."
-
-#~ msgid "Upload to OSM ..."
-#~ msgstr "Chargement vers OSM"
-
-#~ msgid " ({0} node)"
-#~ msgid_plural " ({0} nodes)"
-#~ msgstr[0] " ({0} nœud)"
-#~ msgstr[1] " ({0} nœuds)"
-
-#~ msgid ""
-#~ "The projection \"{0}\" is designed for\n"
-#~ "latitudes between 46.1° and 57° only.\n"
-#~ "Use another projection system if you are not using\n"
-#~ "a french WMS server.\n"
-#~ "Do not upload any data after this message."
-#~ msgstr ""
-#~ "La projection \"{0}\" est prévu pour\n"
-#~ "des latitudes entre 46.1° et 57° seulement.\n"
-#~ "Utiliser un autre système de projection si vous\n"
-#~ "n’utilisez pas un serveur WMS français.\n"
-#~ "N’envoyez aucune donnée après ce message."
-
-#~ msgid ""
-#~ "IMPORTANT : data positionned far away from\n"
-#~ "the current Lambert zone limits.\n"
-#~ "Do not upload any data after this message.\n"
-#~ "Undo your last action, Save your work \n"
-#~ "and Start a new layer on the new zone."
-#~ msgstr ""
-#~ "IMPORTANT : données positionnées loin des\n"
-#~ "limites actuelles de la zone Lambert.\n"
-#~ "N’envoyez aucune donnée après ce message.\n"
-#~ "Annulez votre dernière action, sauvegardez votre\n"
-#~ "travail et ouvrez une noouvelle couche sur cette zone."
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr "Sélectionnez les objets dont vous voulez changer les propriétés."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "Ceci est l'éditeur basique de relation qui vous permet des changer les "
-#~ "étiquette de la relation ainsi que les membres. En supplément, nous "
-#~ "devrions avoir un éditeur intelligent qui détecte le type de relation et "
-#~ "limite les choix de façon sensible."
-
-#~ msgid "Highlight the member from the current table row as JOSM's selection"
-#~ msgstr ""
-#~ "Mettre en évidence le membre de la ligne actuelle comme une sélection de "
-#~ "JOSM"
-
-#~ msgid "Selection: %d way(s) and %d node(s)"
-#~ msgstr "Sélection : %d chemin(s) et %d noeud(s)"
-
-#~ msgid "JOSM, the Java OpenStreetMap editor"
-#~ msgstr "JOSM, l'éditeur OpenStreetMap Java"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Envoyer cette trace..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Cette fonctionnalité n’a été ajoutée que récemment. À "
-#~ "utiliser<br>prudemment et vérifier si cela marche comme attendu.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Envoi des traces filtrées par JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Envoyer le fichier brut : "
-
-#~ msgid "Description:"
-#~ msgstr "Description :"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Étiquettes (mots clés dans le GPX) :"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "Envoi du GPX"
-
-#~ msgid "time"
-#~ msgstr "temps"
-
-#~ msgid "desc"
-#~ msgstr "desc"
-
-#~ msgid "symbol"
-#~ msgstr "symbole"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Envoi du fichier brut : {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Balises:"
-
-#~ msgid "Java OpenStreetMap - Editor"
-#~ msgstr "Java OpenStreetMap - Éditeur"
-
-#~ msgid ""
-#~ "If your gps device draw too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "Si votre périphérique GPS dessine des lignes trop fines, sélectionner "
-#~ "cette option pour dessiner des lignes le long de votre chemin"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr ""
-#~ "Choisir la teinte pour la couleur de la trace à partir de la vitesse à ce "
-#~ "point."
-
-#~ msgid "Configure Sites ..."
-#~ msgstr "Configurer les sites..."
-
-#~ msgid "JOSM - Java OpenStreetMap Editor"
-#~ msgstr "JOSM - Editeur OpenStreetMap Java"
-
-#~ msgid "Unknown type"
-#~ msgstr "Type inconnu"
-
-#~ msgid "NullPointerException, Possibly some missing tags."
-#~ msgstr "NullPointerException, Il est possible que des tags soient manquants"
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Envoi {0} {1} (id: {2}) {3}% {4}/{5} ({6} restant)..."
-
-#~ msgid ""
-#~ "The plugin {0} seem to be broken or could not be downloaded automatically."
-#~ msgstr ""
-#~ "Le greffon {0} semble être cassé ou ne peut pas être téléchargé "
-#~ "automatiquement."
-
-#~ msgid ""
-#~ "<html>Please report a ticket at {0}<br>Include your steps to get to the "
-#~ "error (as detailed as possible)!<br>Be sure to include the following "
-#~ "information:</html>"
-#~ msgstr ""
-#~ "<html>Veuillez ouvrir un ticket ici : {0}<br>Incluez les étapes pour "
-#~ "obtenir l’erreur (aussi détaillées que possible)<br>Assrez-vous d’inclure "
-#~ "les informations suivantes :</html>"
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Éditer une sortie"
-
-#~ msgid "Exit Number"
-#~ msgstr "Numéro de la sortie"
-
-#~ msgid "Exit Name"
-#~ msgstr "Nom de la sortie"
-
-#~ msgid "Waterway"
-#~ msgstr "Chemin d'eau"
-
-#~ msgid "Information point"
-#~ msgstr "Point d'information"
-
-#~ msgid "Provider"
-#~ msgstr "Banque"
-
-#~ msgid "political"
-#~ msgstr "Zone électorale"
-
-#~ msgid "National_park"
-#~ msgstr "Parc national"
-
-#~ msgid "Natural"
-#~ msgstr "Nature"
-
-#~ msgid "Edit Marsh"
-#~ msgstr "Éditer un marais"
-
-#~ msgid "Open Visible ..."
-#~ msgstr "Open Visible ..."
-
-#~ msgid "Add Site"
-#~ msgstr "Ajouter un site"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Supprimer site(s)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Veuillez sélectionner le site à supprimer."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Vérifier le(s) site(s)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr ""
-#~ "Veuillez sélectionner le(s) site(s) à vérifier pour les mises à jour."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Ajouter un nouveau site de greffons."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Supprimer le(s) site(s) sélectionné(s) de la liste."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr ""
-#~ "Vérication des sites sélectionnés pour de nouveaux greffons ou ises à "
-#~ "jour."
-
-#~ msgid "Update Sites"
-#~ msgstr "Mise à jour des sites"
-
-#~ msgid "Version"
-#~ msgstr "Version"
-
-#~ msgid "Install"
-#~ msgstr "Installer"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Version: {0}<br>Dernier changement le {1}"
-
-#~ msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-#~ msgstr "SurveyorPlugin dépend de LiveGpsPlugin !"
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr "LiveGpsPlugin non trouvé, merci de l’installer et de l’activer."
-
-#~ msgid "SurveyorPlugin is disabled for the moment"
-#~ msgstr "SurveyorPlugin est désactivé pour le moment"
-
-#~ msgid "SurveyorPlugin"
-#~ msgstr "SurveyorPlugin"
-
-#~ msgid "Surveyor ..."
-#~ msgstr "Surveyor ..."
-
-#~ msgid ""
-#~ "A OSM data validator that checks for common errors made by users and "
-#~ "editor programs."
-#~ msgstr ""
-#~ "Un validateur des données OSM qui vérifie les erreurs communes commises "
-#~ "par les utilisateurs et les programmes d’édition."
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Version {0} - Dernier changement le {1}"
-
-#~ msgid "Duplicated nodes."
-#~ msgstr "Nœuds dupliqués."
-
-#~ msgid "Similar named ways."
-#~ msgstr "Chemins avec un nom similaire."
-
-#~ msgid "Similar named ways"
-#~ msgstr "Chemins avec un nom similaire"
-
-#~ msgid "Untagged, empty, and one node ways."
-#~ msgstr "Chemins vides, sans étiquette ou avec un seul nœud."
-
-#~ msgid "Open waypoints file"
-#~ msgstr "Ouvrir un fichier de cheminsF"
-
-#~ msgid "Open a waypoints file."
-#~ msgstr "Ouvrir un fichier de chemin"
-
-#~ msgid "Rectified Image ..."
-#~ msgstr "Image réctifiée..."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr ""
-#~ "Erreur de données : La valeur de latitude \\\"{0}\\\" est hors limite."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr ""
-#~ "Erreur de données : La valeur de longitude \\\"{0}\\\" est hors limite."
-
-#~ msgid "Development version. Unknown revision."
-#~ msgstr "Version de développement. Révision inconnue."
-
-#~ msgid ""
-#~ "Plugin archive already available. Do you want to download current version "
-#~ "by deleting existing archive?\n"
-#~ "\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "L'archive du greffon a déjà été téléchargée. Souhiatez-vous télécharger "
-#~ "la version actuelle en supprimant l'archive existante?\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "<html>Fulltext search:<ul><li><b>Baker Street</b> - 'Baker' and 'Street' "
-#~ "in any key or name.</li><li><b>\"Baker Street\"</b> - 'Baker Street' in "
-#~ "any key or name.</li><li><b>name:Bak</b> - 'Bak' anywhere in the name.</"
-#~ "li><li><b>-name:Bak</b> - not 'Bak' in the name.</li><li><b>foot:</b> - "
-#~ "key=foot set to any value.</li><li>Special targets:</li><li><b>type:</b> "
-#~ "- type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)</"
-#~ "li><li><b>user:</b>... - all objects changed by user</li><li><b>id:</"
-#~ "b>... - object with given ID</li><li><b>nodes:</b>... - object with given "
-#~ "number of nodes</li><li><b>modified</b> - all changed objects</"
-#~ "li><li><b>selected</b> - all selected objects</li><li><b>incomplete</b> - "
-#~ "all incomplete objects</li><li>Use <b>|</b> or <b>OR</b> to combine with "
-#~ "logical or</li><li>Use <b>\"</b> to quote operators (e.g. if key "
-#~ "contains :)</li><li>Use <b>(</b> and <b>)</b> to group expressions</li></"
-#~ "ul></html>"
-#~ msgstr ""
-#~ "<html>Recherche plein texte :<ul><li><b>Baker Street</b> - 'Baker' et "
-#~ "'Street' dans n'importe quelle clé ou nom.</li><li><b>\"Baker Street\"</"
-#~ "b> - 'Baker Street' dans n'importe quelle clé ou nom.</li><li><b>name:"
-#~ "Bak</b> - 'Bak' n'importe où dans le nom.</li><li><b>-name:Bak</b> - sans "
-#~ "'Bak' dans le nom.</li><li><b>foot:</b> - key=foot défini sur une "
-#~ "n'importe quelle valeur.</li><li>Special targets:</li><li><b>type:</b> - "
-#~ "type de l'objet (<b>node</b>, <b>way</b>, <b>relation</b>)</"
-#~ "li><li><b>user:</b>... - tous les objets modifiés par l'utilisateur</"
-#~ "li><li><b>id:</b>... - objets avec l'ID défini</li><li><b>nodes:</b>... - "
-#~ "objet avec le numéro de nœud spécifié</li><li><b>modified</b> - tous les "
-#~ "objetsmodifiés</li><li><b>selected</b> - tous les objets sélectionnés</"
-#~ "li><li><b>incomplete</b> - tous les objets incomplets</li><li>Utilisez "
-#~ "<b>|</b> ou <b>OR</b> pour combiner de façon logique ou</li><li>Utilisez "
-#~ "<b>\"</b> pour citer les opérateurs (par ex. si la clé contient :)</"
-#~ "li><li>Utilisez <b>(</b> and <b>)</b> pour grouper les expressions</li></"
-#~ "ul></html>"
-
-#~ msgid "Add Node"
-#~ msgstr "Ajouter un nœud"
-
-#~ msgid "An plugin to trace water bodies on Landsat imagery."
-#~ msgstr "Un greffon pour tracer les nappes d'eau des images Landsat."
-
-#~ msgid "Signpost"
-#~ msgstr "Panneau indicateur"
-
-#~ msgid "office"
-#~ msgstr "bureau"
-
-#~ msgid "guidepost"
-#~ msgstr "poteau indicateur"
-
-#~ msgid ""
-#~ "Header contains several values and cannot be mapped to a single String"
-#~ msgstr ""
-#~ "L'en-tête contient plusieurs valeurs et ne peut être mappés en un seul Mot"
-
-#~ msgid "NoName"
-#~ msgstr "Sans Nom"
-
-#~ msgid ""
-#~ "<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
-#~ "upload these data. Maybe you have selected the wrong layer?"
-#~ msgstr ""
-#~ "<html>Les données sélectionnées contiennent des données de OpenStreetBugs."
-#~ "<br>Vous ne pouvez charger ces données. Peut-être avez-vous sélectionné "
-#~ "la mauvaise couche ?"
-
-#~ msgid "Ref"
-#~ msgstr "Réf"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Mettre à jour l’URL du site"
-
-#~ msgid "Invalid URL"
-#~ msgstr "URL invalide"
-
-#~ msgid "unusual named way type"
-#~ msgstr "type de chemin inhabituel"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Téléchargement du \"Message du jour\""
-
-#~ msgid "Open map features in browser"
-#~ msgstr "Ouvrir les caractéristiques de carte dans le navigateur"
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "Le chemin \"{0}\" doit contenir au moins 2 nœuds."
-
-#~ msgid "Upload GPX track"
-#~ msgstr "Charger la trace GPX"
-
-#~ msgid "Direct Upload to OpenStreetMap"
-#~ msgstr "Envoi direct vers OpenStreetMap"
-
-#~ msgid "Starting to upload selected file to openstreetmap.org"
-#~ msgstr "Début du chargement du fichier sélectionné vers openstreetmap.org"
-
-#~ msgid "Transferring data to server"
-#~ msgstr "Transfert des données vers le serveur"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "Combien de bâtiments mitoyens y-a-t-il ?"
-
-#~ msgid "Update available"
-#~ msgstr "Mise à jour disponible"
-
-#~ msgid "Version Details:"
-#~ msgstr "Détails de version :"
-
-#~ msgid ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
-#~ msgstr ""
-#~ "La vôtre : {2} ; Courante: {0} ; <font style=\"font-size:x-small\">"
-#~ "(dernière non testée : {1} &#150; non recommandée)</font>"
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Description"
+
+#~ msgid "Commit comment"
+#~ msgstr "Commentaire sur cette déposition"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Le serveur ne supporte pas les révisions"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Marquer ce problème comme \"fait\"?"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "Supprimer les nœuds du chemin"
+
+#~ msgid "Start routing"
+#~ msgstr "Commencer la navigation"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Pont-levis"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Modifier un pont-levis"
+
+#~ msgid "Portcullis"
+#~ msgstr "Herse"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Modifier une herse"
+
+#~ msgid "Charge"
+#~ msgstr "Charge"
+
+#~ msgid "sports"
+#~ msgstr "Magasin de sport"
+
+#~ msgid "viaduct"
+#~ msgstr "viaduc"
Index: /applications/editors/josm/i18n/po/he.po
===================================================================
--- /applications/editors/josm/i18n/po/he.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/he.po	(revision 14844)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-29 09:23+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-26 03:29+0000\n"
 "Last-Translator: Moshe Sayag <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr ""
@@ -36,38 +36,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "רמז: כמה מהשינויים הגיעו מהעלאת נתונים חדשים לשרת."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "שינויים לא שמורים"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "ישנם שינויים בלתי שמורים. התעלם מהשינויים והמשך?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "שמור וצא"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "התעלם משינויים וצא"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -78,10 +78,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -92,4 +92,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -99,10 +100,10 @@
 msgstr "ביטול"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -128,8 +129,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -270,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -402,6 +403,6 @@
 msgstr "הפוך כיוון ואחד"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -409,20 +410,20 @@
 msgstr "הזן ערכים לכל ההתנגשויות."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "פתור התנגשויות"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "שלב {0} דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "כל הדרכים היו ריקות"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -522,5 +523,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -639,6 +640,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -647,6 +648,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -770,9 +771,9 @@
 msgstr "מזג בכל זאת"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1044,5 +1045,5 @@
 msgstr "שמור את הנתונים הנוכחיים."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1051,26 +1052,26 @@
 "שגיאה פנימית: לא ניתן לבדוק תנאים לשכבה שלא נבחרה. אנא דווח על זאת כעל תקלה."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "מסמך ריק"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "המסמך לא מכיל נתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "שמור בכל זאת"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "התנגשויות"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1080,32 +1081,32 @@
 "להמשיך?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+msgstr "דחה התנגשויות ושמור"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "שמור קובץ GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "שמור קובץ OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "לא יכול לגבות קובץ."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "סיומת הקובץ אינה ידועה."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "אירעה שגיאה במהלך שמירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "אירעה שגיאה במהלך שחזור קובץ גיבוי."
@@ -1160,18 +1161,18 @@
 msgstr "סגור"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "פצל דרך"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "פצל דרך בנקודה הבחורה."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1179,5 +1180,5 @@
 msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1189,9 +1190,9 @@
 msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "הנקודות הבחורות אינן שייכות לאותה דרך."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1199,10 +1200,10 @@
 msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1210,5 +1211,5 @@
 msgstr "הדרך לא יכולה להתפצל בנקודות שנבחרו. (טיפ: בחר נקודות בתוך הדרך.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1216,5 +1217,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1360,46 +1361,50 @@
 msgstr "פעולה זו תצריך {0} בקשות הורדה נפרדות. האם אתה רוצה להמשיך?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "העלה ל-OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "העלה את כל השינויים לשרת ה-OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "פריטים להוספה:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "פריטים לשינוי:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "פריטים למחיקה:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "העלה את השינויים האלה?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "העלה שינויים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "אין מה להעלות. קבל כמה נתונים תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "ישנן התנגשויות שאינן פתורות. עליך לפתור אותן תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "אין שינויים להעלאה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "מעלה נתונים"
@@ -1584,31 +1589,33 @@
 msgstr "לא ניתן להוסיף צומת מחוץ לעולם"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "הוסף צומת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "הוסף צומת לדרך"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "חבר דרך קיימת לצומת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "הוסף צומת חדש לדרך קיימת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "הוסף צומת לדרך וחבר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr ""
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1617,9 +1624,4 @@
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2029,5 +2031,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2220,5 +2222,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "מסילת רכבת"
@@ -2240,127 +2242,127 @@
 msgstr[1] "{0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "איבר ריק ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "מחק איבר \"{0}\" ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "הדרך \"{0}\" בת פחות משתי נקודות."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "טקסט"
@@ -2368,5 +2370,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2394,5 +2396,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "רקע"
@@ -2449,5 +2451,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2461,5 +2463,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2489,14 +2491,14 @@
 msgstr "הגירסה הפתורה:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "מסר יומי זמין"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "מוריד את \"המסר היומי\""
@@ -2568,71 +2570,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "שם משתמש"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "שימוש"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "אפשרויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "הצג עזרה זו"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "הורד את המיקום שבכתובת (עם lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "פתח קובץ (כ-gps גולמי, אם gpx.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "בחר עם החיפוש הנתון"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "אפס את המאפיינים לברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "קבע את השפה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "דוגמאות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2640,23 +2642,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "מפעיל תוספים מעודכנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "טען תוספים מוקדמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "קביעת ברירות מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "טעינת תוספים"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2834,5 +2841,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3041,5 +3048,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "תפקיד"
@@ -3087,73 +3094,71 @@
 msgstr "תכונות \\ חברויות"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "צור יחס חדש"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "ערוך יחס חדש"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "ערוך יחס מספר {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "בסיסי"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "תפוס ע\"י"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "תוויות (ערך ריק מוחק את התווית)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "הזז את החברים הנבחרים מעלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "הוסף את הנבחרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "הוסף את כל העצמים הנבחרים כחברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "הסרת הנבחרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "הסר את כל העצמים הנבחרים מהיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "הזז מטה את החברים שנבחרו"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3162,36 +3167,36 @@
 msgstr "הסר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "הורד חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "חברים: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "ארעו התנגשויות במהלך הייבוא."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "שגיאה בניתוח תשובת השרת."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "לא יכול להתחבר לשרת"
@@ -3205,10 +3210,11 @@
 msgstr "מחק את היחס הנבחר"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "יחסים"
@@ -3398,5 +3404,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "מקומות"
@@ -3443,21 +3449,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "סוג"
@@ -3508,10 +3514,7 @@
 msgstr "ניתן להשתמש בעכבר או ב- Ctrl+מקשי חיצים/./ למיקוד והזזה."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "מפה"
@@ -3665,4 +3668,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3768,5 +3772,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3827,19 +3831,34 @@
 "באופן הגיוני הושמטו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "מחוץ לשטח שהורד"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "גירסא {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} מורכב מ-:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} נמחק/ו.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "שימוש"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "גירסא {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3847,21 +3866,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4281,5 +4300,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4364,4 +4383,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4445,7 +4466,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4458,7 +4476,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4474,10 +4499,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4646,5 +4671,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4678,7 +4705,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4762,4 +4789,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4812,4 +4847,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4818,7 +4859,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4827,15 +4865,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4860,129 +4887,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "שם"
@@ -5031,12 +5060,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "טען את כל המשטחים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "כלום"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5063,45 +5090,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "רכב"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "אופניים"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5109,25 +5126,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "רגל"
@@ -5175,7 +5197,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "צייר קווים בין נקודות ה-gps הגולמיות."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5776,10 +5797,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, כנראה שחסרים תגים."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "מכין נתונים..."
@@ -5789,25 +5810,75 @@
 msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "אין שינויים להעלאה."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "מכין..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "מעלה..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "שגיאה בניתוח תשובת השרת."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "מארח לא ידוע"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "סיסמא או שם משתמש שגויים."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "אזהרה: הסיסמא נשלחת בצורה לא מוצפנת."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "הכנס סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "התחברות"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5818,44 +5889,52 @@
 msgstr "שגיאה בזמן הניתוח."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "גרסה לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "גרסה לא ידוע"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "נמצא <nd> שלא בתוך דרך."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "ל <nd> אין התייחסות (ref)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "עצם לא חוקי עם id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "מכין נתוני OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr ""
@@ -5865,10 +5944,10 @@
 msgstr "מתחבר לשרת..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5876,55 +5955,8 @@
 msgstr "השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "הערת ביצוע"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "אירעה שגיאה: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "מארח לא ידוע"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "מכין..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "מעלה..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "ההעברה הופסקה בגלל שגיאה (יחכה 5 שניות):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6086,6 +6118,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "לא ידוע"
@@ -6268,7 +6300,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "צור אזורים"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6287,7 +6318,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "צור אזורים"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6311,5 +6341,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "תיאור"
@@ -7551,7 +7581,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "מים"
@@ -7847,5 +7877,5 @@
 msgstr "לולאת הורדה של OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -7862,4 +7892,11 @@
 msgstr "אזהרה"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "אירעה שגיאה: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7885,35 +7922,38 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "הוסף תגובה"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "הכנס את התגובה שלך"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "סמן כהושלם"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "באמת סמן פריט זה כ-\"הושלם\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "באמת לסגור?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "פריט חדש"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "צור פריט"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "תאר את הבעיה בדיוק"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "צור פריט"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -7942,5 +7982,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -7949,9 +7989,9 @@
 "Firefox לא נמצא. קבע את קובץ ההרצה של Firefox בדף Map Settings של המאפיינים."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "קובץ הרצת פיירפוקס"
@@ -8021,95 +8061,77 @@
 msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "ניווט"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "כלום"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "יעד"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "לחץ כדי להוסיף צומת חדש."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-#, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "לחץ כדי להוסיף צומת חדש."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "מוריד נקודות כפולות..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "פתח רשימה של כל היחסים."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "תחנה"
+msgid "Add routing layer"
+msgstr "הוסף שכבה חדשה"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "בינוני"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "קיצור-דרך"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "מהר יותר"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "הפוך דרכים"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "נתיב מעבורת"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "מאפייני תוסף WMS"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "התאם אתרי תוספים"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "יציאה מדרך מהירה"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "מהירות מירבית (קמ\"ש)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "ימינה"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8117,33 +8139,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "טען משטח"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "הראה מצב משטח"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "בקש עדכון"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "טען את כל המשטחים"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "הגדל"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "הקטן"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "תמונה לא נטענה"
@@ -8166,34 +8188,34 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "מקורות משטחים"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "מיקוד אוטומטי: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "טען משטחים אוטומטית: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "רמת מיקוד מירבית: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "התבקש: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "שגיאה בבקשת עדכון"
@@ -8208,5 +8230,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8261,7 +8283,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "ערוך מדינה"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8276,7 +8297,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "כלום"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
@@ -8288,17 +8308,17 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "שנה תכונות של עד עצם {0}"
-msgstr[1] "שנה תכונות של עד {0} עצמים"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "שנה תכונות של עד עצם {0}"
-msgstr[1] "שנה תכונות של עד {0} עצמים"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -8307,25 +8327,21 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "נחל"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "חפש"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "קובץ"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "רכב"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8409,5 +8425,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "שם רחוב"
@@ -8440,5 +8456,5 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113
 msgid "Replaces Selection with Users data"
-msgstr "החלף בחי6רה עם נתוני משתמש"
+msgstr "החלף בחירה עם נתוני משתמש"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148
@@ -8509,17 +8525,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "יחס"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "אחד שטחים חופפים"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "אחד שטחים חופפים"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8530,12 +8543,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "התנגשויות מתמזגות"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "מחק מיחס"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8544,12 +8555,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "דרכים בלתי סגורות"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "הסר תמונה משכבה"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
@@ -9138,4 +9147,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9217,7 +9232,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "בניין"
@@ -9231,5 +9246,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "שטח"
@@ -9503,4 +9518,9 @@
 msgstr "לא יכול לקבל קלט שמע מכתובת הקלט"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9527,7 +9547,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "צור אזורים"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9618,21 +9637,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9641,15 +9667,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9659,15 +9685,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9676,5 +9702,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9683,5 +9709,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9690,5 +9716,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9778,5 +9804,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "התייחסות"
@@ -9831,7 +9857,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "שכבה"
@@ -9874,5 +9900,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "מהירות מירבית (קמ\"ש)"
@@ -9920,5 +9946,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "חד סטרי"
@@ -9974,5 +10000,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "גשר"
@@ -10022,5 +10048,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "מנהרה"
@@ -10067,5 +10093,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr ""
@@ -10112,5 +10138,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr ""
@@ -10268,6 +10294,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr ""
@@ -10316,5 +10342,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "שטח פנים"
@@ -10346,5 +10372,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "סלול"
@@ -10355,5 +10381,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "לא סלול"
@@ -10367,5 +10393,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "אבני ריצוף"
@@ -10517,5 +10543,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10536,6 +10562,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "כן"
@@ -10679,7 +10705,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "לא"
@@ -10693,73 +10719,63 @@
 msgstr ""
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "סוס"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "אופנוע"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr ""
@@ -10834,130 +10850,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "סוג"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10965,5 +10869,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10971,11 +10875,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10983,5 +10881,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10989,5 +10887,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10995,5 +10893,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11001,6 +10899,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11019,6 +10923,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr ""
@@ -11044,6 +10948,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr ""
@@ -11069,6 +10973,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "ראשי"
@@ -11094,6 +10998,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "משני"
@@ -11107,5 +11011,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "שלישוני"
@@ -11123,5 +11027,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "מגורים"
@@ -11139,5 +11043,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "שירות"
@@ -11164,6 +11068,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "בנייה"
@@ -11204,6 +11108,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11214,5 +11117,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "כיכר"
@@ -11556,14 +11459,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "מפעיל"
@@ -11588,20 +11491,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "אי"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11609,5 +11512,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11616,5 +11519,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11624,5 +11527,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11771,10 +11674,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "הגבהה"
@@ -11787,29 +11691,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr ""
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11818,7 +11711,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11827,69 +11723,54 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "תנועה מותרת:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "מחסום"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr ""
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
 #: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr ""
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr ""
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
 msgid "Bus Trap"
 msgstr ""
@@ -11897,36 +11778,87 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr ""
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:864
 msgid "Spikes"
 msgstr "דוקרנים"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:865
 msgid "Edit Spikes"
 msgstr "ערוך דוקרנים"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr ""
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "תא אגרה"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "ערוך תא אגרה"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "ביקורת גבולות"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "ערוך ביקורת גבולות"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "חומה"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "חומת עיר"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "כניסה"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "ערוך כניסה"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "שער"
@@ -11934,128 +11866,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr "ערוך שער"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "מחסום"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "חומה"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "חומת עיר"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "תא אגרה"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "ערוך תא אגרה"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "ביקורת גבולות"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "ערוך ביקורת גבולות"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "כניסה"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "ערוך כניסה"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "מים"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "מעיין"
@@ -12063,5 +11947,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "ערוך מעיין"
@@ -12069,5 +11953,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr ""
@@ -12075,10 +11959,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "נחל"
@@ -12086,10 +11970,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "ערוך נחל"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "תעלה"
@@ -12097,10 +11981,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "ערוך תעלה"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "נהר"
@@ -12110,5 +11994,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "ערוך נהר"
@@ -12116,15 +12000,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "ערוך מים"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "אדמה"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "ערוך אדמה"
@@ -12132,31 +12016,31 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1073
+msgid "Basin"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1074
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Basin" text "Name"
+#: build/trans_presets.java:1079
+msgid "Reservoir"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1081
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Reservoir" text "Name"
+#: build/trans_presets.java:1086
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1087
-msgid "Basin"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1088
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
-msgid "Reservoir"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1101
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -12164,5 +12048,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "גדת נחל"
@@ -12171,10 +12055,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "ערוך גדת נחל"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr ""
@@ -12185,56 +12069,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "אדמה בוצית"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "מצע קנה-סוף"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "ביצה מלוחה"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "מנגרוב"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "בוץ"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "ערוך בוץ"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "חוף"
@@ -12242,20 +12126,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "ערוך חוף"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "מפרץ"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "ערוך מפרץ"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "צוק"
@@ -12263,10 +12147,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "ערוך צוק"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "קו חוף"
@@ -12274,5 +12158,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "ערוך קו חוף"
@@ -12280,5 +12164,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "נתיב מעבורת"
@@ -12286,5 +12170,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "ערוך מעבורת"
@@ -12293,5 +12177,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "מספנה"
@@ -12299,10 +12183,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "ערוך מספנה"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr ""
@@ -12310,5 +12194,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr ""
@@ -12316,5 +12200,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr ""
@@ -12322,15 +12206,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr ""
@@ -12339,5 +12223,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr ""
@@ -12345,20 +12229,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr ""
@@ -12367,15 +12251,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr ""
@@ -12383,10 +12267,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr ""
@@ -12394,10 +12278,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr ""
@@ -12407,5 +12291,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr ""
@@ -12413,10 +12297,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr ""
@@ -12424,5 +12308,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr ""
@@ -12452,8 +12336,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr ""
@@ -12467,81 +12351,81 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr ""
 
+#: build/trans_presets.java:1228
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1229
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#: build/trans_presets.java:1234
+msgid "Monorail"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1236
+msgid "Edit Monorail"
+msgstr ""
+
+#: build/trans_presets.java:1241
+msgid "Preserved"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1242
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1243
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-#: build/trans_presets.java:1248
-msgid "Monorail"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1255
-msgid "Preserved"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1256
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "רכבת קלה"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "ערוך רכבת קלה"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "רכבת תחתית"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "ערוך רכבת תחתית"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr ""
@@ -12549,5 +12433,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -12556,14 +12440,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr ""
@@ -12572,5 +12456,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr ""
@@ -12579,5 +12463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr ""
@@ -12587,5 +12471,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12593,5 +12477,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr ""
@@ -12600,57 +12484,70 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
+#: build/trans_presets.java:1314
+msgid "Chair Lift"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
+#: build/trans_presets.java:1316
+msgid "Edit Chair Lift"
+msgstr ""
+
+#. item "Aerialway/Chair Lift" text "Name"
+#: build/trans_presets.java:1320
+msgid "Drag Lift"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
+#: build/trans_presets.java:1322
+msgid "Edit Drag Lift"
+msgstr ""
+
+#. item "Aerialway/Drag Lift" text "Name"
+#: build/trans_presets.java:1326
+msgid "Cable Car"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #: build/trans_presets.java:1328
-msgid "Chair Lift"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
-msgid "Edit Chair Lift"
-msgstr ""
-
-#. item "Aerialway/Chair Lift" text "Name"
+msgid "Edit Cable Car"
+msgstr ""
+
+#. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #: build/trans_presets.java:1334
-msgid "Drag Lift"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
-msgid "Edit Drag Lift"
-msgstr ""
-
-#. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
-msgid "Cable Car"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
-msgid "Edit Cable Car"
-msgstr ""
-
-#. item "Aerialway/Cable Car" text "Name"
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "ערוך גולף"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "תחנה"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "ערוך תחנה"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "דלק"
@@ -12660,5 +12557,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "ערוך דלק"
@@ -12674,5 +12571,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12682,5 +12579,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr ""
@@ -12688,40 +12585,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "שטיפה"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "ערוך שטיפת רכב"
@@ -12729,5 +12627,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "חנות"
@@ -12735,15 +12633,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "ערוך חנות רכב"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "תיקונים"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "ערוך תיקוני רכבים"
@@ -12751,5 +12649,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "השכרה"
@@ -12758,10 +12656,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "ערוך השכרת רכב"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "שיתוף"
@@ -12769,5 +12667,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "ערוך שיתוף רכבים"
@@ -12775,5 +12673,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -12782,5 +12680,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "ערוך השכרת אופניים"
@@ -12789,15 +12687,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "ערוך חנות אופניים"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
-msgstr ""
+msgstr "תחבורה ציבורית"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr ""
@@ -12805,5 +12703,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr ""
@@ -12811,5 +12709,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr ""
@@ -12817,5 +12715,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr ""
@@ -12824,5 +12722,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr ""
@@ -12830,5 +12728,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr ""
@@ -12837,5 +12735,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr ""
@@ -12847,5 +12745,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr ""
@@ -12853,10 +12751,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "כניסת רכבת תחתית"
@@ -12865,10 +12763,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "ערוך כניסת רכבת תחתית"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr ""
@@ -12877,5 +12775,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "תחנת אוטובוס"
@@ -12884,5 +12782,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "ערוך תחנת אוטובוס"
@@ -12890,5 +12788,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr ""
@@ -12898,5 +12796,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr ""
@@ -12904,10 +12802,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr ""
@@ -12915,5 +12813,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "מונית"
@@ -12921,5 +12819,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "ערוך תחנת מוניות"
@@ -12927,5 +12825,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "שדה תעופה"
@@ -12933,15 +12831,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "ערוך שדה תעופה"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr ""
@@ -12950,5 +12848,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "לינה"
@@ -12960,5 +12858,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "מלון"
@@ -12967,89 +12865,89 @@
 #. <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:1532
+msgid "Edit Hotel"
+msgstr ""
+
+#. item "Accomodation/Hotel" text "Name"
+#: build/trans_presets.java:1535
+msgid "Stars"
+msgstr ""
+
+#. item "Accomodation/Hotel" combo "Stars"
+#: build/trans_presets.java:1537
+msgid "Motel"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #: build/trans_presets.java:1539
-msgid "Edit Hotel"
-msgstr ""
-
-#. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
-msgid "Stars"
-msgstr ""
-
-#. item "Accomodation/Hotel" combo "Stars"
+msgid "Edit Motel"
+msgstr ""
+
+#. item "Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1543
+msgid "Guest House"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1544
-msgid "Motel"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
-msgid "Edit Motel"
-msgstr ""
-
-#. item "Accomodation/Motel" text "Name"
+msgid "Edit Guest House"
+msgstr ""
+
+#. item "Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1548
+msgid "Chalet"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #: build/trans_presets.java:1550
-msgid "Guest House"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1551
-msgid "Edit Guest House"
-msgstr ""
-
-#. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
-msgid "Chalet"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
+#: build/trans_presets.java:1554
+msgid "Hostel"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
+#: build/trans_presets.java:1556
+msgid "Edit Hostel"
+msgstr ""
+
+#. item "Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1560
+msgid "Alpine Hut"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1561
-msgid "Hostel"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
-msgid "Edit Hostel"
-msgstr ""
-
-#. item "Accomodation/Hostel" text "Name"
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1566
+msgid "Caravan Site"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1567
-msgid "Alpine Hut"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1568
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Accomodation/Alpine Hut" text "Elevation"
+msgid "Edit Caravan Site"
+msgstr ""
+
+#. item "Accomodation/Caravan Site" text "Name"
+#: build/trans_presets.java:1571
+msgid "Camping Site"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #: build/trans_presets.java:1573
-msgid "Caravan Site"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1574
-msgid "Edit Caravan Site"
-msgstr ""
-
-#. item "Accomodation/Caravan Site" text "Name"
+msgid "Edit Camping Site"
+msgstr ""
+
+#. item "Accomodation/Camping Site" text "Name"
 #: build/trans_presets.java:1578
-msgid "Camping Site"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
-msgid "Edit Camping Site"
-msgstr ""
-
-#. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
 msgid "Food+Drinks"
 msgstr "מזון ושתיה"
@@ -13060,5 +12958,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "מסעדה"
@@ -13066,5 +12964,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr ""
@@ -13072,5 +12970,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr ""
@@ -13078,61 +12976,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "קבב"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "תורכי"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "אסייתי"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "תאילנדי"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "מקסיקני"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "יפני"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "מזון מהיר"
@@ -13140,9 +13038,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "ערוך מסעדת מזון מהיר"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "בית קפה"
@@ -13150,10 +13048,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "ערוך בית קפה"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "פאב"
@@ -13161,20 +13059,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "ערוך פאב"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "בר"
@@ -13182,10 +13080,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "ערוך בר"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "מועדון לילה"
@@ -13193,20 +13091,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "ערוך מועדון לילה"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "תיירות"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr ""
@@ -13215,22 +13113,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "מוזיאון"
@@ -13238,10 +13125,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "ערוך מוזיאון"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "גן חיות"
@@ -13250,10 +13137,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "ערוך גן חיות"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "נקודת תצפית"
@@ -13261,25 +13148,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr "ערוך נקודת תצפית"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr "מגדל תצפית"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr "פארק שעשועים"
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr "ערוך פארק שעשועים"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "יצירת אומנות"
@@ -13287,5 +13174,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr "ערוך יצירת אומנות"
@@ -13293,77 +13180,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "מפה"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "מפת עיר"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "מפת צעידה"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "מפת רכיבה"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "היסטוריה"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "טבע"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "מקלט"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "ערוך מקלט"
@@ -13371,25 +13270,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "אתר פיקניק"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "ערוך אתר פיקניק"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "מקומות היסטורים"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "טירה"
@@ -13398,20 +13297,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "ערוך טירה"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "חורבות"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "ערוך חורבות"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "אתר ארכיאולוגי"
@@ -13420,20 +13319,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "ערוך אתר ארכיאולוגי"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "שדה קרב"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "ערוך שדה קרב"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "אנדרטה"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "ערוך אנדרטה"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "מצבת זיכרון"
@@ -13441,56 +13352,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "ערוך מצבת זיכרון"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "שדה קרב"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "ערוך שדה קרב"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "פנאי"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "פארק מים"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "ערוך פארק מים"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "מגרש משחקים"
@@ -13498,15 +13398,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "ערוך מגרש משחקים"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "דייג"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "ערוך דייג"
@@ -13514,15 +13414,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "מתקני ספורט"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "איצטדיון"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "ערוך איצטדיון"
@@ -13536,6 +13436,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "בחר ענף ספורט:"
@@ -13614,4 +13514,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -13903,28 +13811,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "ספורט"
@@ -13934,227 +13843,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "קשתות"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "אתלטיקה"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "כדור בסיס"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "כדורסל"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "כדורת דשא"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "קנו"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "טיפוס"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "קריקט"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "מירוץ כלבים"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "כדורגל אמריקאי"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "גולף"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "התעמלות"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "הוקי"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "מירוץ סוסים"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "רוגבי"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "סקייטבורד"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "סקייטים"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "סקי"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "כדורגל"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "שחייה"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "טניס שולחן"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "טניס"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "מרכז ספורט"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "ערוך מרכז ספורט"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "מסלול מירוצים"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "ערוך מסלול מירוצים"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "מגרש גולף"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "ערוך מגרש גולף"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "מיני-גולף"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "ערוך מיני-גולף"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "ספורט"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr ""
@@ -14193,191 +14102,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "מרכז ספורט"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "איצטדיון"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "אתלטיקה"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "ערוך אתלטיקה"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "קשתות"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "ערוך קשתות"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "טיפוס"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "ערוך טיפוס"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "רכיבה"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "ערוך רכיבה"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "מירוץ כלבים"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "ערוך מירוץ כלבים"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "מירוץ סוסים"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "ערוך מירוץ סוסים"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "התעמלות"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "ערוך התעמלות"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "ספורט מוטורי"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "ערוך ספורט מוטורי"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "סקייטבורד"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "ערוך סקייטבורד"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "שחייה"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "ערוך שחייה"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "סקי"
@@ -14385,56 +14294,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "ערוך סקי"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "סוג מסלול"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "גלישה במורד"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "פארק שלג"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "קושי"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "מתחילים"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "קל"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "בינוני"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "מתקדמים"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "מקצוענים"
 
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "ירי"
@@ -14442,178 +14353,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "ערוך ירי"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "ספורט (משחקי כדור)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "כדורגל"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "ערוך כדורגל"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "כדורגל אמריקאי"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "ערוך כדורגל אמריקאי"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "כדורגל אוסטרלי"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "ערוך כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "כדור בסיס"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "גולף"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "ערוך גולף"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "מגרש גולף"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "כדורת דשא"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "ערוך כדורת דשא"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "הוקי"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "ערוך הוקי"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "רוגבי"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "ערוך רוגבי"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "טניס"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "מבנים"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "מבנה"
@@ -14621,5 +14532,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -14627,10 +14538,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "ערוך מבנה ציבור"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "בניין העירייה"
@@ -14638,10 +14549,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "ערוך בניין העירייה"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "שגרירות"
@@ -14649,10 +14560,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "ערוך שגרירות"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -14661,10 +14572,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "ערוך בית משפט"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "כלא"
@@ -14673,10 +14584,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "ערוך כלא"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "משטרה"
@@ -14686,10 +14597,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "ערוך משטרה"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -14698,10 +14609,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "ערוך תחנת מכבי אש"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "דואר"
@@ -14709,5 +14620,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "ערוך דואר"
@@ -14715,15 +14626,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "בית ספר"
@@ -14731,10 +14642,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "ערוך בית ספר"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "אוניברסיטה"
@@ -14742,10 +14653,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "ערוך אוניברסיטה"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "מכללה"
@@ -14753,5 +14664,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "ערוך מכללה"
@@ -14759,5 +14670,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "קולנוע"
@@ -14766,10 +14677,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "ערוך קולנוע"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "ספרייה"
@@ -14778,10 +14689,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "ערוך ספרייה"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -14789,10 +14700,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "ערוך מרכז אומנויות"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "תיאטרון"
@@ -14801,10 +14712,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "ערוך תיאטרון"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -14814,5 +14725,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "ערוך מקום תפילה"
@@ -14821,6 +14732,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "דת"
@@ -14829,66 +14740,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
+msgstr "מזרקה"
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr ""
@@ -14897,81 +14809,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "סוני"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "כתובות"
@@ -14980,5 +14892,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "ערוך כתובת"
@@ -14986,5 +14898,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "מספר בית"
@@ -14992,20 +14904,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "שם בית"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "שם עיר"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "מיקוד"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "קוד מדינה"
@@ -15013,5 +14925,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr ""
@@ -15020,5 +14932,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -15026,67 +14938,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "סכמת מספור"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "אי-זוגי"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "זוגי"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "הכל"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "אתלטיקה"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "מגדל"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -15094,10 +15011,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -15105,10 +15022,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "צינור"
@@ -15116,10 +15033,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "ערוך צינור"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr ""
@@ -15129,10 +15046,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr ""
@@ -15140,10 +15057,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr ""
@@ -15151,10 +15068,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr ""
@@ -15162,10 +15079,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr ""
@@ -15173,5 +15090,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -15179,5 +15096,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr ""
@@ -15187,39 +15104,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
+#: build/trans_presets.java:2260
+msgid "wind"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "hydro"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "fossil"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "nuclear"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "coal"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "photovoltaic"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "gas"
+msgstr ""
+
+#. item "Man Made/Power Generator" text "Name"
 #: build/trans_presets.java:2263
-msgid "wind"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "hydro"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "fossil"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "nuclear"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "coal"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "photovoltaic"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "gas"
-msgstr ""
-
-#. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -15228,10 +15145,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr ""
@@ -15240,5 +15157,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -15246,10 +15163,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "עמוד חשמל"
@@ -15260,5 +15177,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "ערוך עמוד חשמל"
@@ -15266,5 +15183,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "קו מתח"
@@ -15273,25 +15190,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "ערוך קו מתח"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
+#: build/trans_presets.java:2294
+msgid "Amount of Wires"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Amount of Wires"
 #: build/trans_presets.java:2297
-msgid "Amount of Wires"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "שירותים"
@@ -15299,25 +15216,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr ""
 
-#. item "Amenities/Toilets" text "Reference number"
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
+msgid "Note"
+msgstr ""
+
+#. item "Amenities/Toilets" text "Note"
 #: build/trans_presets.java:2307
-msgid "Charge"
-msgstr ""
-
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
-msgid "Note"
-msgstr ""
-
-#. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
 msgid "Post Box"
 msgstr "תיבת דואר"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "טלפון"
@@ -15326,5 +15238,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "ערוך טלפון"
@@ -15332,5 +15244,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr ""
@@ -15338,5 +15250,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr ""
@@ -15344,5 +15256,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -15350,5 +15262,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr ""
@@ -15356,15 +15268,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr ""
@@ -15373,5 +15285,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "ערוך תחנת מיחזור"
@@ -15379,35 +15291,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2330
+msgid "Batteries"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2331
+msgid "Cans"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2332
+msgid "Clothes"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Clothes"
 #: build/trans_presets.java:2333
-msgid "Batteries"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Batteries"
+msgid "Glass"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Glass"
 #: build/trans_presets.java:2334
-msgid "Cans"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Cans"
+msgid "Paper"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Paper"
 #: build/trans_presets.java:2335
-msgid "Clothes"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
-msgid "Glass"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Glass"
+msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
 #: build/trans_presets.java:2337
-msgid "Paper"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
-msgid "Scrap Metal"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
 msgid "Bench"
 msgstr "ספסל"
@@ -15416,20 +15328,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:2342
+msgid "Edit Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand" check "Shelter"
 #: build/trans_presets.java:2345
-msgid "Edit Hunting Stand"
-msgstr ""
-
-#. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr ""
@@ -15437,22 +15349,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "מזרקה"
@@ -15461,10 +15373,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -15473,10 +15385,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr ""
@@ -15484,25 +15396,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -15510,10 +15422,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "ערוך מכולת"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "קיוסק"
@@ -15521,10 +15433,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "ערוך קיוסק"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -15532,5 +15444,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -15538,88 +15450,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "קצבייה"
@@ -15627,10 +15539,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "ערוך קצבייה"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "מאפייה"
@@ -15638,10 +15550,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "ערוך מאפייה"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "פרחים"
@@ -15649,70 +15561,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "ערוך חנות פרחים"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "ערוך חנות אורגנית"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "בית ספר"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "ערוך חנות נעליים"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "ערוך חנות משקאות"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "ערוך חנות מחשבים"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "ערוך חנות אלקטרוניקה"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr ""
@@ -15720,10 +15646,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -15731,10 +15657,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "חנות עשה-זאת-בעצמך"
@@ -15742,60 +15668,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "ערוך חנות עשה-זאת-בעצמך"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "מספרה"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "ערוך מספרה"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "ערוך חנות נעליים"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "ערוך חנות וידאו"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "ניקוי יבש"
@@ -15803,10 +15729,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "ערוך ניקוי יבש"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "מכבסה"
@@ -15814,10 +15740,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "ערוך מכבסה"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr ""
@@ -15825,35 +15751,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
 msgstr "ספורט"
 
 #. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "ערוך חנות ספורט"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "אופטיקאי"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "ערוך אופטיקאי"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "בנק"
@@ -15861,5 +15789,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "ערוך בנק"
@@ -15867,10 +15795,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -15878,5 +15806,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -15884,15 +15812,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "רופאים"
@@ -15900,20 +15828,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -15921,5 +15849,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -15927,10 +15855,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "בית חולים"
@@ -15938,10 +15866,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -15950,5 +15878,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -15957,20 +15885,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "מספר טלפון"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -15978,5 +15906,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -15985,25 +15913,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "יבשת"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "ארץ"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "ערוך ארץ"
@@ -16011,45 +15939,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "מדינה"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "אזור"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "מחוז"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "ערוך מחוז"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "עיר"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "עיירה"
@@ -16057,10 +15986,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "פרבר"
@@ -16068,30 +15997,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "כפר"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "מקומיות"
@@ -16099,10 +16029,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "אי"
@@ -16110,5 +16040,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "ערוך אי"
@@ -16116,5 +16046,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -16122,10 +16052,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "ערוך פתח מערה"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "פסגה"
@@ -16133,10 +16063,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "ערוך פסגה"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "קרחון"
@@ -16144,10 +16074,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "ערוך קרחון"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "הר געש"
@@ -16155,70 +16085,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "ערוך הר געש"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "לאומי"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr "פוליטי"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "עץ"
@@ -16227,15 +16157,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "חורש"
@@ -16244,5 +16174,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "ערוך חורש"
@@ -16250,17 +16180,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "יער"
@@ -16269,19 +16199,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "שדה-בור"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "ערוך שדה-בור"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -16290,70 +16264,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr ""
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "דשא"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16361,10 +16336,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr ""
@@ -16372,20 +16347,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr ""
@@ -16393,5 +16368,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -16399,15 +16374,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -16415,9 +16390,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -16425,39 +16400,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr ""
@@ -16465,114 +16440,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "צבאי"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr ""
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
-msgid "Brownfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2886
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
-msgid "Greenfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2892
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2921
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2922
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2927
+msgid "Brownfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2928
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:2933
+msgid "Greenfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2934
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "צבאי"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr ""
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "שדה-בור"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "ערוך שדה-בור"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr ""
@@ -16582,5 +16514,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr ""
@@ -16589,10 +16521,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr ""
@@ -16600,5 +16532,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr ""
@@ -16607,5 +16539,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -16613,34 +16545,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr ""
@@ -16649,15 +16581,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr ""
@@ -16665,5 +16597,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16672,5 +16604,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16678,5 +16610,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -16748,24 +16680,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "אופניים"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -16810,4 +16742,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16817,19 +16752,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "רגל"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -16843,10 +16779,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -16854,26 +16790,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr ""
@@ -16882,30 +16818,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17089,4 +17025,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17098,4 +17141,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17197,11 +17249,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "מיושן"
@@ -17243,7 +17297,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "סוס"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "מחסומים"
 
 #. color tertiary
@@ -17279,6 +17548,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "רחוב"
@@ -17334,7 +17603,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr ""
@@ -17381,108 +17650,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr ""
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr ""
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17499,4 +17681,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "שירות"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17506,4 +17694,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "אזור צליחה"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17520,7 +17714,21 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "נקודת גישה בחירום"
 
 #. color water
@@ -17533,5 +17741,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "גדת נחל"
@@ -17545,5 +17753,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "זרם"
@@ -17557,5 +17765,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr ""
@@ -17583,5 +17791,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "אקוודוקט"
@@ -17596,4 +17804,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17633,5 +17842,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17748,12 +17957,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "מעשה אדם"
@@ -17799,5 +18009,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17815,7 +18025,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17838,10 +18048,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17871,6 +18081,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -17915,6 +18125,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -17928,5 +18138,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "מסוף"
@@ -17948,5 +18158,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -17960,5 +18170,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -17981,4 +18191,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -17998,4 +18216,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr ""
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18004,23 +18228,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr ""
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "מסלול קל"
@@ -18034,5 +18245,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "מסלול בינוניים"
@@ -18046,5 +18258,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "מסלול מתקדמים"
@@ -18057,6 +18270,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "מקצוענים"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18070,5 +18298,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "מסלול מתחילים"
@@ -18099,4 +18328,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18131,4 +18368,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18141,8 +18402,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "תחנת כח"
@@ -18155,5 +18418,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "מזח"
@@ -18167,5 +18433,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "צינור"
@@ -18293,12 +18559,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "פנאי"
@@ -18312,5 +18578,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr ""
@@ -18382,8 +18648,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18419,4 +18685,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18476,11 +18750,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18619,6 +18893,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18845,22 +19140,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -18892,6 +19187,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -18927,4 +19222,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -18944,7 +19247,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "בריאות"
@@ -19038,4 +19342,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19238,4 +19550,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19269,28 +19597,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "חנות"
@@ -19344,4 +19674,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19354,8 +19692,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "מלון"
@@ -19410,4 +19748,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19504,9 +19843,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "תיירות"
@@ -19578,8 +19917,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "היסטורי"
@@ -19649,9 +19988,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "ירוק"
@@ -19665,5 +20004,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "מחצבה"
@@ -19677,5 +20016,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr ""
@@ -19697,5 +20036,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr ""
@@ -19709,5 +20048,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "יער"
@@ -19721,5 +20060,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -19742,5 +20081,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "קמעוני"
@@ -19754,5 +20093,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "תעשייתי"
@@ -19766,5 +20105,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19778,5 +20117,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -19790,5 +20129,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -19845,7 +20184,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "צבאי"
@@ -19859,5 +20198,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "בית עלמין"
@@ -19870,5 +20209,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "פיסגה"
@@ -19883,5 +20222,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "קרחון"
@@ -19895,5 +20234,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "הר געש"
@@ -19908,4 +20247,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19947,7 +20287,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "טבעי"
@@ -19961,5 +20302,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr ""
@@ -19973,5 +20314,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr ""
@@ -19985,5 +20326,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr ""
@@ -19997,5 +20338,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "בוץ"
@@ -20009,5 +20350,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "חוף"
@@ -20085,8 +20426,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr ""
@@ -20134,7 +20475,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "גבול"
@@ -20276,10 +20617,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "מקום"
@@ -20320,6 +20661,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "כתובת"
@@ -20601,173 +20949,24 @@
 msgstr ""
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "אם מכשיר ה gps שלך מצייר קווים מעטים מידי, בחר את זה כדי לצייר קווים "
-#~ "לאורך דרכך."
-
-#~ msgid "Navigate"
-#~ msgstr "נווט"
-
-#~ msgid "Navigator"
-#~ msgstr "נווט"
-
-#~ msgid "Reset Graph"
-#~ msgstr "אפס גרף"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "נא בחר משהו מרשימת ההתנגשות."
-
-#~ msgid "Please select a color."
-#~ msgstr "בחר צבע."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "אל תריץ במסך מלא"
-
-#~ msgid "News about JOSM"
-#~ msgstr "חדשות אודות JOSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "לחץ כדי ליצור דרך חדשה לצומת הקיים."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "לחץ כדי ליצור קישור לצומת החדש."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "לחץ כדי להוסיף צומת וליצור דרך חדשה."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "לחץ כדי להוסיף צומת חדש וליצור קישור."
-
-#~ msgid "Description:"
-#~ msgstr "תיאור:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "תגים (מילות מפתח ב GPX)"
-
-#~ msgid "time"
-#~ msgstr "זמן"
-
-#~ msgid "desc"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "פתח..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
 #~ msgstr "תיאור"
 
-#~ msgid "symbol"
-#~ msgstr "סמל"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "העלה קובץ גולמי: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "תגיות:"
-
-#~ msgid "Unknown type"
-#~ msgstr "סוג לא ידוע"
-
-#~ msgid "NullPointerException, Possibly some missing tags."
-#~ msgstr "NullPointerException, כנראה בגלל תגיות חסרות."
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "מעלה {0} {1} (id: {2}) {3}% {4}/{5} ({6} נשארו)..."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "ערוך יציאה"
-
-#~ msgid "Exit Number"
-#~ msgstr "מספר יציאה"
-
-#~ msgid "Exit Name"
-#~ msgstr "שם יציאה"
-
-#~ msgid "Information point"
-#~ msgstr "נקודת מידע"
-
-#~ msgid "Provider"
-#~ msgstr "ספק"
-
-#~ msgid "political"
-#~ msgstr "מדיני"
-
-#~ msgid "National_park"
-#~ msgstr "גן לאומי"
-
-#~ msgid "Natural"
-#~ msgstr "טבעי"
-
-#~ msgid "Add Site"
-#~ msgstr "הוסף אתר"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "מחק אתר(ים)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "בחר אתר למחיקה"
-
-#~ msgid "Check Site(s)"
-#~ msgstr "בדוק אתר(ים)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "בחר אתר(ים) לבדיקת עידכונים."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "הוסף אתר תוספים חדש."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "מחק את האתר(ים) הנבחרים מהרשימה"
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr "בדוק את האתר(ים) הנבחרים לתוספים חדשים או עדכונים"
-
-#~ msgid "Update Sites"
-#~ msgstr "עדכן אתרים"
-
-#~ msgid "Version"
-#~ msgstr "גירסא"
-
-#~ msgid "Install"
-#~ msgstr "התקן"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "גירסא: {0}<br>שונה לאחרונה ב {1}"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "גירסא {0} - שונה לאחרונה ב {1}"
-
-#~ msgid "Open waypoints file"
-#~ msgstr "פתח קובץ נקודות דרך"
-
-#~ msgid "Open a waypoints file."
-#~ msgstr "פתח קובץ נקודות דרך."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "שגיאת נתונים: קו-רוחב \"{0}\" הינו מחוץ לתחום."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "שגיאת נתונים: קו-אורך \"{0}\" הינו מחוץ לתחום."
-
-#~ msgid "Signpost"
-#~ msgstr "שלט"
-
-#~ msgid "office"
-#~ msgstr "משרד"
-
-#~ msgid "NoName"
-#~ msgstr "ללא שם"
-
-#~ msgid "Update Site URL"
-#~ msgstr "עדכן כתובת אתר"
-
-#~ msgid "Invalid URL"
-#~ msgstr "כתובת לא תקינה"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "מוריד את \"המסר היומי\""
-
-#~ msgid "Direct Upload to OpenStreetMap"
-#~ msgstr "העלאה ישירה ל OpenStreetMap"
-
-#~ msgid "Transferring data to server"
-#~ msgstr "מעביר נתונים לשרת"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "כמה מבנים יש על המדרג?"
+#~ msgid "Commit comment"
+#~ msgstr "הערת ביצוע"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "ההעברה הופסקה בגלל שגיאה (יחכה 5 שניות):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "באמת סמן פריט זה כ-\"הושלם\"?"
+
+#~ msgid "Navigation"
+#~ msgstr "ניווט"
+
+#~ msgid "sports"
+#~ msgstr "ספורט"
Index: /applications/editors/josm/i18n/po/is.po
===================================================================
--- /applications/editors/josm/i18n/po/is.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/is.po	(revision 14844)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-31 14:40+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-24 13:35+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Bý til aðal notandaviðmót"
@@ -36,38 +36,38 @@
 msgstr "Gat ekki lesið vörpun úr stillingum. Nota EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Óvistaðar breytingar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Það eru óvistaðar breytingar. Hunsa þær og loka forritinu?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Vista og hætta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Hunsa og hætta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -78,10 +78,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -92,4 +92,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -99,10 +100,10 @@
 msgstr "Hætta við"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -128,8 +129,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -270,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -406,6 +407,6 @@
 msgstr "Skipta um átt og sameina"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -413,20 +414,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Leysa árekstra"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sameina {0} vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -528,5 +529,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -643,6 +644,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -651,6 +652,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -775,9 +776,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 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:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1049,5 +1050,5 @@
 msgstr "Vista þau gögn sem sjást núna."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1055,26 +1056,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Tómt skjal"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Árekstrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1082,32 +1083,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Vista GPX skrá"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Vista OSM skrá"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Óþekkt skráarending"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1161,18 +1162,18 @@
 msgstr "Loka"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Skipta veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Skipta veg á völdum hnút(um)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1180,5 +1181,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1190,9 +1191,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1200,10 +1201,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1211,5 +1212,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1217,5 +1218,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1362,46 +1363,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Upphala til OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Upphala öllum breytingum á OSM þjóninn."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Hlutum sem verður bætt við:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Hlutum sem verður breytt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Hlutum sem verður eytt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Bættu við stuttri umsögn um þær breytingar sem þú ert að hlaða upp:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Hlaða upp breytingum?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Hlaða upp breytingum"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Það eru óleystir breytingarárekstrar. Þú verður að leysa þá fyrst."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Engar  breytingar til að hlaða upp."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Hleð upp gögnum"
@@ -1584,31 +1589,33 @@
 msgstr "Get ekki bætt við hnút handan endamarka veraldar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Bæta við hnút"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Bæta hnút við veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr ""
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1617,9 +1624,4 @@
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2033,5 +2035,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2224,5 +2226,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr ""
@@ -2244,127 +2246,127 @@
 msgstr[1] "{0} hnútar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Óþekkt hlutverk \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr ""
@@ -2372,5 +2374,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2398,7 +2400,7 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
-msgstr ""
+msgstr "bakgrunnur"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
@@ -2453,5 +2455,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2465,5 +2467,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2493,14 +2495,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Ekki var hægt að ná í skilaboð dagsins"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -2566,71 +2568,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Notandanafn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+msgid "usage"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+msgid "options"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
-msgid "usage"
+msgid "Show this help"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
+msgid "Standard unix geometry argument"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
-msgid "options"
+msgid "Download the bounding box"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
-msgid "Show this help"
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
-msgid "Standard unix geometry argument"
+msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
-msgid "Download the bounding box"
+msgid "Download the bounding box as raw gps"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgid "Select with the given search"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
-msgid "Open file (as raw gps, if .gpx)"
+msgid "Launch in maximized mode"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
-msgid "Download the bounding box as raw gps"
+msgid "Reset the preferences to default"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
-msgid "Select with the given search"
+msgid "Set the language."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
-msgid "Launch in maximized mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-msgid "Reset the preferences to default"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-msgid "Set the language."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2638,22 +2640,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Virki uppfærðar viðbætur"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+msgid "Loading early plugins"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
-msgid "Loading early plugins"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
@@ -2832,5 +2839,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3039,5 +3046,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Hlutverk"
@@ -3085,73 +3092,71 @@
 msgstr ""
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Vista breytingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Skapa ný vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Breyta venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Breyta venslum #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Gengt af"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Eigindi (tómt gildi eyðir eigindunum)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Færa valda meðlimi upp"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Bæta við vali"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Bæta völdum hlutum við venslin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Fjarlægja val"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Færa valda meðlimi niður"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3160,36 +3165,36 @@
 msgstr "Fjarlægja"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Fjarlægja val úr venslunum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Niðurhala meðlimum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hala niður öllum nóðum og vegum í þessum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Stök: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr ""
@@ -3203,10 +3208,11 @@
 msgstr "Eyða völdum venslum"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Vensl"
@@ -3399,5 +3405,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Staðir"
@@ -3444,21 +3450,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "gerð"
@@ -3484,5 +3490,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109
 msgid "Slippy map"
-msgstr "Hált kort"
+msgstr "Gagnvirkt kort"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
@@ -3511,10 +3517,7 @@
 msgstr "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Kort"
@@ -3668,4 +3671,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3769,5 +3773,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3824,19 +3828,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Útgáfa {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "Tölfræði um {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "Endurstilla"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Útgáfa {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3844,21 +3863,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -3895,5 +3914,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
 msgid "gps marker"
-msgstr ""
+msgstr "gps punktur"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
@@ -4278,5 +4297,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4361,4 +4380,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4442,7 +4463,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4455,7 +4473,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4471,10 +4496,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4643,5 +4668,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4675,7 +4702,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4759,4 +4786,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4809,4 +4844,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4815,7 +4856,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4824,15 +4862,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4857,129 +4884,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Heiti"
@@ -5032,7 +5061,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Athugasemd"
+msgstr "Aldrei"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5059,45 +5087,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Bíll"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Hjól"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5105,25 +5123,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Fótgangandi"
@@ -5171,7 +5194,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Teikna línu á milli GPS punkta."
+msgstr "Teikna línu á milli GPS punkta"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5450,5 +5472,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:39
 msgid "Base Server URL"
-msgstr ""
+msgstr "Slóð OSM þjóns"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
@@ -5772,10 +5794,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "Tómur bendill, hugsanvega vantar einhver eigindi."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Undirbý gögn..."
@@ -5785,25 +5807,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Opna breytingasett..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Loka breytingasetti..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Engar  breytingar til að hlaða upp."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Undirbý..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Hleð upp gögnum..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+msgid "Error processing changeset upload response"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Rangt lykilorð eða notandanafn"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 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:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Vista notandanafn og lykilorð (ódulkóðað)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Sláðu inn lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5814,44 +5885,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Óþekkt útgáfa"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Óþekkt útgáfa"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Ógildur hlutur með kenni=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Atriði merkt \"{0}\" vantar"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Undirbý OSM gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Illa-formað kenni á hnút"
@@ -5861,5 +5940,5 @@
 msgstr "Hef samband við þjóninn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -5867,5 +5946,5 @@
 "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5875,55 +5954,8 @@
 "reyna síðar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Bættu við stuttri umsögn um þær breytingar sem þú ert að hlaða upp:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Staðfesta umsögn"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} búið. Hleð upp: {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Villa kom upp: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Opna breytingasett..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Þjónn styður ekki breytingasett"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Undirbý..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Hleð upp gögnum..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Loka breytingasetti..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6081,6 +6113,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr ""
@@ -6261,7 +6293,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Búa til svæði"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6280,7 +6311,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Búa til svæði"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6306,5 +6336,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Lýsing"
@@ -7538,7 +7568,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "vatn"
@@ -7831,5 +7861,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Sýna OpenStreetBugs pöddur"
@@ -7846,4 +7876,11 @@
 msgstr ""
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Villa kom upp: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7869,35 +7906,38 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Bæta við athugasemd"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Merkja sem klárað"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Ný padda"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Búa til pöddu"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Lýstu vandamálinu nákvæmlega"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Búa til pöddu"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -7926,5 +7966,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -7932,9 +7972,9 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr ""
@@ -8002,72 +8042,59 @@
 msgstr ""
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr ""
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
-#, fuzzy
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 msgid "Routing"
-msgstr "Niðurgrafinn"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-msgid "Click to add route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-msgid "Click and drag to move route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Fjarlægja val"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
+msgid "Click to add destination."
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "Sýna lista yfir vensl"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Skautar"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+msgid "Add routing layer"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "Búa til svæði"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Skóbúð"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Líma"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Skipta um átt vega"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
 msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Tilvísunarnúmer línunnar"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
@@ -8076,17 +8103,14 @@
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Gerð þjónustuvegs"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Hámarkshraði (km/klst)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Hæð"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8094,33 +8118,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
-msgstr "Hált kort"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+msgstr "Gagnvirkt kort"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr ""
@@ -8143,34 +8167,34 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr ""
@@ -8185,5 +8209,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8238,7 +8262,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Breyti fylki"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8253,12 +8276,10 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "hnútur"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "Hæð"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
@@ -8266,17 +8287,17 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Breyta eigindum allt að {0} hluts"
-msgstr[1] "Breyta eigindum allt að {0} hluta"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Breyta eigindum allt að {0} hluts"
-msgstr[1] "Breyta eigindum allt að {0} hluta"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -8285,25 +8306,21 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Lækur"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Leit"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Skrá"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Bíll"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8387,5 +8404,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Nafn götu"
@@ -8487,7 +8504,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "vensl"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
@@ -8506,12 +8522,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Breytingarárekstrar."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Fjarlægja úr venslum"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8520,7 +8534,6 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Sameina vegi"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
@@ -9109,4 +9122,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9188,7 +9207,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "bygging"
@@ -9202,5 +9221,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr ""
@@ -9472,4 +9491,9 @@
 msgstr ""
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9496,7 +9520,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Búa til svæði"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9587,21 +9610,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9610,15 +9640,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9628,15 +9658,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9645,5 +9675,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9652,5 +9682,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9659,5 +9689,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9747,5 +9777,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Tilvísun"
@@ -9800,7 +9830,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Lag"
@@ -9843,5 +9873,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Hámarkshraði (km/klst)"
@@ -9889,5 +9919,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Einstefnuvegur"
@@ -9943,5 +9973,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brú"
@@ -9991,5 +10021,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Göng"
@@ -10036,5 +10066,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Niðurgrafinn"
@@ -10081,5 +10111,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Upphækkun"
@@ -10237,6 +10267,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Breidd (í metrum)"
@@ -10285,5 +10315,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Slitlag"
@@ -10315,5 +10345,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr ""
@@ -10324,5 +10354,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr ""
@@ -10336,5 +10366,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr ""
@@ -10486,5 +10516,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10505,6 +10535,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "já"
@@ -10648,7 +10678,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "nei"
@@ -10662,73 +10692,63 @@
 msgstr ""
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Hestar"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Vélhjól"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Bifreið"
@@ -10803,130 +10823,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Gerð"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10934,5 +10842,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10940,11 +10848,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10952,5 +10854,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10958,5 +10860,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10964,5 +10866,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10970,6 +10872,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -10988,6 +10896,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "hraðbraut"
@@ -11013,6 +10921,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "stofnvegur"
@@ -11038,6 +10946,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr ""
@@ -11063,6 +10971,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr ""
@@ -11076,5 +10984,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr ""
@@ -11092,5 +11000,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "íbúðargata"
@@ -11108,5 +11016,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr ""
@@ -11133,6 +11041,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "byggingarsvæði"
@@ -11173,6 +11081,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11183,5 +11090,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "hringtorg"
@@ -11525,14 +11432,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Rekstraraðili"
@@ -11557,20 +11464,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "eyja"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11578,5 +11485,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11585,5 +11492,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11593,5 +11500,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11740,10 +11647,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -11756,29 +11664,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr ""
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11787,7 +11684,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11796,75 +11696,43 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Leyfileg umferð:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr ""
-
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr ""
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
 msgid "Cattle Grid"
 msgstr "Rimlahlið"
@@ -11872,30 +11740,98 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
+#: build/trans_presets.java:851
 msgid "Edit Cattle Grid"
 msgstr "Breyti rimlahliði"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:865
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr ""
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Tollskýli"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Breyti tollskýli"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Landamæraeftirlit"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Breyti landamæraeftirliti"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Limgerði"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Borgarveggur"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Inngangur"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Breyti inngang"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "Hlið"
@@ -11903,128 +11839,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr "Breyti hliði"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr "Liftuhlið"
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr "Breyti liftuhliði"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Limgerði"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Borgarveggur"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Tollskýli"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Breyti tollskýli"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Landamæraeftirlit"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Breyti landamæraeftirliti"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Inngangur"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Breyti inngang"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Vatn"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Goshver"
@@ -12032,5 +11920,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Breyti goshver"
@@ -12038,5 +11926,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Frárennsli"
@@ -12044,10 +11932,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Breyti frárennsli"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Lækur"
@@ -12055,10 +11943,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Breyti læk"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Skipaskurður"
@@ -12066,10 +11954,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Breyti skipaskurð"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Á"
@@ -12079,5 +11967,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Breyti á"
@@ -12085,15 +11973,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Breyti vatni"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Breyti landi"
@@ -12101,31 +11989,31 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1073
+msgid "Basin"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1074
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Basin" text "Name"
+#: build/trans_presets.java:1079
+msgid "Reservoir"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1081
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Reservoir" text "Name"
+#: build/trans_presets.java:1086
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1087
-msgid "Basin"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1088
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
-msgid "Reservoir"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1101
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -12133,5 +12021,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Árbakki"
@@ -12140,10 +12028,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Breyti árbakka"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Votlendi"
@@ -12154,56 +12042,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Breyti votlendi"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr ""
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Leðja"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Breyti leðju"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Strönd"
@@ -12211,20 +12099,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Breyti strönd"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Flói"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Breyti flóa"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Klettur"
@@ -12232,10 +12120,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Breyti klett"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Strandlengja"
@@ -12243,5 +12131,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Breyti strandlengju"
@@ -12249,5 +12137,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr ""
@@ -12255,5 +12143,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr ""
@@ -12262,5 +12150,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr ""
@@ -12268,10 +12156,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Skipakví"
@@ -12279,5 +12167,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Breyti skipakví"
@@ -12285,5 +12173,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Stífla"
@@ -12291,15 +12179,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Breyti stíflu"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Vatnspunktar"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr ""
@@ -12308,5 +12196,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr ""
@@ -12314,20 +12202,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Breyti fossi"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr ""
@@ -12336,15 +12224,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Smábátahöfn"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Breyti smábátahöfn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Bryggja"
@@ -12352,10 +12240,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Breyti bryggju"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr ""
@@ -12363,10 +12251,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr ""
@@ -12376,5 +12264,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr ""
@@ -12382,10 +12270,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr ""
@@ -12393,5 +12281,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr ""
@@ -12421,8 +12309,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr ""
@@ -12436,87 +12324,87 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr ""
 
+#: build/trans_presets.java:1228
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1229
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#: build/trans_presets.java:1234
+msgid "Monorail"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1236
+msgid "Edit Monorail"
+msgstr ""
+
+#: build/trans_presets.java:1241
+msgid "Preserved"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1242
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1243
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#: build/trans_presets.java:1247
+msgid "Light Rail"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1248
-msgid "Monorail"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1255
-msgid "Preserved"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1256
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1261
-msgid "Light Rail"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1262
 msgid "Edit Light Rail"
 msgstr ""
 
+#: build/trans_presets.java:1253
+msgid "Subway"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1254
+msgid "Edit Subway"
+msgstr ""
+
+#: build/trans_presets.java:1259
+msgid "Tram"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1260
+msgid "Edit Tram"
+msgstr ""
+
+#: build/trans_presets.java:1265
+msgid "Bus Guideway"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #: build/trans_presets.java:1267
-msgid "Subway"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1268
-msgid "Edit Subway"
-msgstr ""
-
-#: build/trans_presets.java:1273
-msgid "Tram"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1274
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1279
-msgid "Bus Guideway"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -12525,14 +12413,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr ""
@@ -12541,5 +12429,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr ""
@@ -12548,5 +12436,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr ""
@@ -12556,5 +12444,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12562,5 +12450,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr ""
@@ -12569,10 +12457,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Skíðalyfta"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Stólalyfta"
@@ -12580,10 +12468,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Breyti stólalyftu"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Toglyfta"
@@ -12591,10 +12479,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Breyti toglyftu"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr ""
@@ -12602,24 +12490,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Breyti dýragarð"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr ""
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Bensínstöð"
@@ -12629,5 +12530,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Breyti bensínstöð"
@@ -12643,5 +12544,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12651,5 +12552,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Breyti stæði"
@@ -12657,40 +12558,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "slitlag"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Bílaþvottastöð"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Breyti bílaþvottastöð"
@@ -12698,5 +12600,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Búð"
@@ -12704,15 +12606,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Breyti bílabúð"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr ""
@@ -12720,5 +12622,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Leiga"
@@ -12727,10 +12629,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Breyti bílaleigu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr ""
@@ -12738,5 +12640,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr ""
@@ -12744,5 +12646,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Breyti hjólastæði"
@@ -12751,5 +12653,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Breyti hjólaleigu"
@@ -12758,15 +12660,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Breyti hjólabúð"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Almenningssamgöngur"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Tilvísun"
@@ -12774,5 +12676,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr ""
@@ -12780,5 +12682,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr ""
@@ -12786,5 +12688,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr ""
@@ -12793,5 +12695,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr ""
@@ -12799,5 +12701,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr ""
@@ -12806,5 +12708,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr ""
@@ -12816,5 +12718,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr ""
@@ -12822,10 +12724,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr ""
@@ -12834,10 +12736,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr ""
@@ -12846,5 +12748,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Strætóstöð"
@@ -12853,5 +12755,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Breyti strætóstöð"
@@ -12859,5 +12761,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Strætóstopp"
@@ -12867,5 +12769,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Breyti strætóstoppi"
@@ -12873,10 +12775,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr ""
@@ -12884,5 +12786,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Leigubílastöð"
@@ -12890,5 +12792,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Breyti leigubílastöð"
@@ -12896,5 +12798,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Flugvöllur"
@@ -12902,15 +12804,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Breyti flugvelli"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr ""
@@ -12919,5 +12821,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Gisting"
@@ -12929,5 +12831,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hótel"
@@ -12936,15 +12838,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Breyti hóteli"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Stjörnur"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Vegahótel"
@@ -12952,20 +12854,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Breyti vegahóteli"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -12973,10 +12875,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -12984,30 +12886,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Breyti farfuglaheimili"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Húsbílastæði"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Tjaldstæði"
@@ -13015,10 +12917,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Breyti tjaldstæði"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -13029,5 +12931,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Veitingastaður"
@@ -13035,5 +12937,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Breyti veitingastað"
@@ -13041,5 +12943,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Matargerð"
@@ -13047,61 +12949,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "ítölsk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "kínversk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "grísk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "þýsk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indversk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "tyrknesk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asísk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "tælensk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexíkósk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japönsk"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -13109,9 +13011,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Breyti skyndibitastað"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -13119,10 +13021,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Breyti kaffihúsi"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Bar"
@@ -13130,31 +13032,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Breyti bar"
 
 #. item "Food+Drinks/Pub" text "Name"
+#: build/trans_presets.java:1605
+msgid "Biergarten"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1606
+msgid "Edit Biergarten"
+msgstr ""
+
+#. item "Food+Drinks/Biergarten" text "Name"
+#: build/trans_presets.java:1610
+msgid "Bar"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #: build/trans_presets.java:1612
-msgid "Biergarten"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1613
-msgid "Edit Biergarten"
-msgstr ""
-
-#. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
-msgid "Bar"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Næturklúbbur"
@@ -13162,20 +13064,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Breyti næturklúbb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr ""
@@ -13184,11 +13086,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Opnunartími"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "Safn"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "Breyti safni"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "Dýragarður"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "Breyti dýragarð"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "Útsýnisstaður"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "Breyti útsýnisstað"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr ""
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "Skemmtigarður"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "Breyti skemmtigarð"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "Listaverk"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "Breyti listaverki"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
@@ -13196,143 +13159,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
 msgstr "Breyti upplýsingamiðstöð"
 
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "Safn"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "Breyti safni"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "Dýragarður"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "Breyti dýragarð"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "Útsýnisstaður"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "Breyti útsýnisstað"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr ""
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "Skemmtigarður"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "Breyti skemmtigarð"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "Listaverk"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "Breyti listaverki"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
-msgstr ""
-
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr "Gerð korts"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "kort"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "borgarkort"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "göngukort"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "hjólakort"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr "Nánari lýsing"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr "Viðfangsefni skiltisins"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "sagnfræði"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "náttúran"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr "dýralíf"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Skýli"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Breyti skýli"
@@ -13340,25 +13243,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Eldstæði"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Sögustaðir"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Kastali"
@@ -13367,20 +13270,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Breyti kastala"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -13389,20 +13292,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Breyti fornleifasvæði"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Vígvöllur"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Breyti vígvelli"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -13410,56 +13325,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Vígvöllur"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Breyti vígvelli"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -13467,15 +13371,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
@@ -13483,15 +13387,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr ""
@@ -13505,6 +13409,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -13583,4 +13487,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -13872,28 +13784,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "íþrótt"
@@ -13903,227 +13816,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "bogfimi"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "hafnabolti"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "körfubolti"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "klifur"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hokkí"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "skautar"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "skíði"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "sund"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "borðtennis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr ""
@@ -14162,191 +14075,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "völlur"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Skautar"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Sund"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Skíði"
@@ -14354,56 +14267,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
+#: build/trans_presets.java:1924
+msgid "Difficulty"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:1924
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "advanced"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "Difficulty"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
-msgid "novice"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "easy"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "intermedia"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "advance"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr ""
@@ -14411,178 +14324,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Amerískur fótbolti"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Breyti Amerískum fótbolta"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:1967
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
 #: build/trans_presets.java:1970
-msgid "Edit Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf" combo "type"
+msgid "golf_course"
+msgstr ""
+
+#: build/trans_presets.java:1972
+msgid "Boule"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1973
-msgid "golf_course"
-msgstr ""
-
-#: build/trans_presets.java:1975
-msgid "Boule"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1976
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Byggingar"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Bygging"
@@ -14590,5 +14503,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -14596,10 +14509,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -14607,10 +14520,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -14618,10 +14531,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -14630,10 +14543,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Fangelsi"
@@ -14642,10 +14555,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -14655,10 +14568,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -14667,10 +14580,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Pósthús"
@@ -14678,5 +14591,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
@@ -14684,15 +14597,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Skóli"
@@ -14700,10 +14613,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Háskóli"
@@ -14711,10 +14624,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Menntaskóli"
@@ -14722,5 +14635,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
@@ -14728,5 +14641,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -14735,10 +14648,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Bókasafn"
@@ -14747,10 +14660,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -14758,10 +14671,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Leikhús"
@@ -14770,10 +14683,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -14783,5 +14696,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -14790,6 +14703,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr ""
@@ -14798,66 +14711,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
+msgstr "ítölsk"
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr ""
@@ -14866,81 +14780,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Heimilisfang"
@@ -14949,5 +14863,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Breyti heimilisfangi"
@@ -14955,5 +14869,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Húsnúmer"
@@ -14961,20 +14875,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Nafn húss"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Landskóði"
@@ -14982,5 +14896,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr ""
@@ -14989,5 +14903,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -14995,67 +14909,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
+#: build/trans_presets.java:2179
+msgid "Numbering scheme"
+msgstr ""
+
+#. item "Buildings/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:2179
+msgid "odd"
+msgstr ""
+
+#: build/trans_presets.java:2179
+msgid "even"
+msgstr ""
+
+#: build/trans_presets.java:2179
+msgid "all"
+msgstr ""
+
+#: build/trans_presets.java:2179
+msgid "alphabetic"
+msgstr ""
+
 #: build/trans_presets.java:2182
-msgid "Numbering scheme"
-msgstr ""
-
-#. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
-msgid "odd"
-msgstr ""
-
-#: build/trans_presets.java:2182
-msgid "even"
-msgstr ""
-
-#: build/trans_presets.java:2182
-msgid "all"
-msgstr ""
-
-#: build/trans_presets.java:2185
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Turn"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Viti"
@@ -15063,10 +14981,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -15074,10 +14992,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -15085,10 +15003,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr ""
@@ -15098,10 +15016,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Krani"
@@ -15109,10 +15027,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Breyti krana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr ""
@@ -15120,10 +15038,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr ""
@@ -15131,10 +15049,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -15142,5 +15060,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
@@ -15148,5 +15066,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Rafall"
@@ -15156,39 +15074,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
+#: build/trans_presets.java:2260
+msgid "wind"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "hydro"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "fossil"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "nuclear"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "coal"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "photovoltaic"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "gas"
+msgstr ""
+
+#. item "Man Made/Power Generator" text "Name"
 #: build/trans_presets.java:2263
-msgid "wind"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "hydro"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "fossil"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "nuclear"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "coal"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "photovoltaic"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "gas"
-msgstr ""
-
-#. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
 msgid "Power Station"
 msgstr "Orkuver"
@@ -15197,10 +15115,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -15209,5 +15127,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -15215,10 +15133,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -15229,5 +15147,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
@@ -15235,5 +15153,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Raflína"
@@ -15242,25 +15160,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Volt"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Fjöldi víra"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Salerni"
@@ -15268,25 +15186,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Tilvísun"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Gjaldtaka"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -15295,5 +15208,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
@@ -15301,5 +15214,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Mynt"
@@ -15307,5 +15220,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Athugasemd"
@@ -15313,5 +15226,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -15319,5 +15232,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -15325,15 +15238,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -15342,5 +15255,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -15348,35 +15261,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Föt"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Bekkur"
@@ -15385,20 +15298,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:2342
+msgid "Edit Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand" check "Shelter"
 #: build/trans_presets.java:2345
-msgid "Edit Hunting Stand"
-msgstr ""
-
-#. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr ""
@@ -15406,22 +15319,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -15430,10 +15343,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -15442,10 +15355,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -15453,25 +15366,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr ""
@@ -15479,10 +15392,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -15490,10 +15403,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Breyti sjoppu"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -15501,5 +15414,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr ""
@@ -15507,88 +15420,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "dagblöð"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "dót"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Slátrari"
@@ -15596,10 +15509,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Breyti slátrara"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Bakarí"
@@ -15607,10 +15520,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Breyti bakaríi"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Blómabúð"
@@ -15618,70 +15531,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Breyti blómabúð"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "Lífræn búð"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Skóli"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Breyti skóbúð"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Vínbúð"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Breyti vínbúð"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Tölvubúð"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hljómtækjaverslun"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr ""
@@ -15689,10 +15616,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -15700,10 +15627,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -15711,60 +15638,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Skrifstofuvörur"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Hársnyrtir"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Skóbúð"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Dótabúð"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -15772,10 +15699,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Breyti efnalaug"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -15783,10 +15710,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Breyti þvottahúsi"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -15794,35 +15721,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Breyti útivistarbúð"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "íþróttir"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Íþróttir"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr ""
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "Sjóntækjasmiður"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Breyti sjóntækjasmið"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Fjármál"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Banki"
@@ -15830,5 +15759,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Breyti banka"
@@ -15836,10 +15765,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Hraðbanki"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -15847,5 +15776,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Breyti gjaldeyrisskiptum"
@@ -15853,15 +15782,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Breyti hraðbanka"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Heilsa"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Læknir"
@@ -15869,20 +15798,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Breyti lækni"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -15890,5 +15819,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Apótek"
@@ -15896,10 +15825,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Spítali"
@@ -15907,10 +15836,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Breyti spítala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr ""
@@ -15919,5 +15848,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -15926,20 +15855,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -15947,5 +15876,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -15954,25 +15883,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Breyti landi"
@@ -15980,45 +15909,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Fylki"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Svæði"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Sýsla"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Breyti sýslu"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Borg"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Bær"
@@ -16026,10 +15956,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Hverfi"
@@ -16037,30 +15967,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Þorp"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr ""
@@ -16068,10 +15999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Eyja"
@@ -16079,5 +16010,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Breyti eyju"
@@ -16085,5 +16016,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -16091,10 +16022,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Breyti hellismunna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Tindur"
@@ -16102,10 +16033,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Breyti tind"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Jökull"
@@ -16113,10 +16044,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Breyti jökli"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -16124,70 +16055,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Breyti eldfjalli"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Tré"
@@ -16196,15 +16127,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Breyti tré"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Skógur"
@@ -16213,5 +16144,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Breyti skóg"
@@ -16219,17 +16150,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "barrskógur"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "laufskógur"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "blandaður"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -16238,19 +16169,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Breyti ræktuðum skóg"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr ""
@@ -16259,70 +16234,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr ""
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Garður"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16330,10 +16306,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr ""
@@ -16341,20 +16317,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr ""
@@ -16362,5 +16338,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -16368,15 +16344,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -16384,9 +16360,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr ""
@@ -16394,39 +16370,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Smásala"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr ""
@@ -16434,114 +16410,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr ""
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
-msgid "Brownfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2886
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
-msgid "Greenfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2892
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2921
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2922
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2927
+msgid "Brownfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2928
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:2933
+msgid "Greenfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2934
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr ""
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr ""
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr ""
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr ""
@@ -16551,5 +16484,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr ""
@@ -16558,10 +16491,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr ""
@@ -16569,5 +16502,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr ""
@@ -16576,5 +16509,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -16582,34 +16515,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -16618,15 +16551,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 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:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "að vegi"
@@ -16634,5 +16567,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16641,5 +16574,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16647,5 +16580,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -16717,24 +16650,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "hjól"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -16779,4 +16712,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16786,19 +16722,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -16812,10 +16749,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -16823,26 +16760,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr ""
@@ -16851,30 +16788,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17058,4 +16995,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17067,4 +17111,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17166,11 +17219,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr ""
@@ -17212,7 +17267,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr ""
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Tálmar"
 
 #. color tertiary
@@ -17248,6 +17518,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "stræti"
@@ -17303,7 +17573,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr ""
@@ -17350,108 +17620,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr ""
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr ""
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17468,4 +17651,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "Þjónustuvegur"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17475,4 +17664,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Vað"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17489,8 +17684,21 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "beygjuhringur"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
+msgstr ""
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17502,5 +17710,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "árbakki"
@@ -17514,5 +17722,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "lækur"
@@ -17526,5 +17734,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr ""
@@ -17552,5 +17760,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr ""
@@ -17565,4 +17773,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17602,5 +17811,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17717,12 +17926,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr ""
@@ -17768,5 +17978,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17784,7 +17994,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17807,10 +18017,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17840,6 +18050,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -17884,6 +18094,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -17897,5 +18107,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr ""
@@ -17917,5 +18127,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -17929,5 +18139,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -17950,4 +18160,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -17967,4 +18185,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "skíðalyfta"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -17973,23 +18197,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "skíðalyfta"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr ""
@@ -18003,5 +18214,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr ""
@@ -18015,5 +18227,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr ""
@@ -18026,6 +18239,20 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+msgid "piste_expert"
+msgstr ""
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18039,5 +18266,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr ""
@@ -18068,4 +18296,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18100,4 +18336,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18110,8 +18370,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr ""
@@ -18124,5 +18386,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "bryggja"
@@ -18136,5 +18401,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "leiðsla"
@@ -18262,12 +18527,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "frístundir"
@@ -18281,5 +18546,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "smábátahöfn"
@@ -18351,8 +18616,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18388,4 +18653,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18445,11 +18718,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18588,6 +18861,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18814,22 +19108,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -18861,6 +19155,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -18896,4 +19190,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -18913,7 +19215,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr ""
@@ -19007,4 +19310,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19207,4 +19518,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19238,28 +19565,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr ""
@@ -19313,4 +19642,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19323,8 +19660,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hótel"
@@ -19379,4 +19716,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19473,9 +19811,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "ferðamennska"
@@ -19547,8 +19885,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr ""
@@ -19618,9 +19956,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr ""
@@ -19634,5 +19972,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr ""
@@ -19646,5 +19984,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr ""
@@ -19666,5 +20004,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr ""
@@ -19678,5 +20016,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "skógur (ræktaður)"
@@ -19690,5 +20028,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -19711,5 +20049,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "smásala"
@@ -19723,5 +20061,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "iðnaður"
@@ -19735,5 +20073,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19747,5 +20085,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -19759,5 +20097,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -19814,7 +20152,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr ""
@@ -19828,5 +20166,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr ""
@@ -19839,5 +20177,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "tindur"
@@ -19852,5 +20190,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "jökul"
@@ -19864,5 +20202,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "eldfjall"
@@ -19877,4 +20215,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19916,7 +20255,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr ""
@@ -19930,5 +20270,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr ""
@@ -19942,5 +20282,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr ""
@@ -19954,5 +20294,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "skógur"
@@ -19966,5 +20306,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "leðja"
@@ -19978,5 +20318,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "strönd"
@@ -20054,8 +20394,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr ""
@@ -20103,7 +20443,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr ""
@@ -20245,10 +20585,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr ""
@@ -20289,6 +20629,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr ""
@@ -20500,5 +20847,5 @@
 #: build/trans_validator.java:69
 msgid "restaurant without name"
-msgstr ""
+msgstr "nafnlaus veitingastaður"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
@@ -20569,2 +20916,22 @@
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
+
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Opna..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Lýsing"
+
+#~ msgid "Commit comment"
+#~ msgstr "Staðfesta umsögn"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Þjónn styður ekki breytingasett"
+
+#~ msgid "Charge"
+#~ msgstr "Gjaldtaka"
+
+#~ msgid "sports"
+#~ msgstr "íþróttir"
Index: /applications/editors/josm/i18n/po/it.po
===================================================================
--- /applications/editors/josm/i18n/po/it.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/it.po	(revision 14844)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-25 08:46+0000\n"
-"Last-Translator: Davide Prade <davalv@alice.it>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-17 13:38+0000\n"
+"Last-Translator: David Paleino <d.paleino@gmail.com>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,9 +13,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:52+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Creazione dell'interfaccia principale"
@@ -34,5 +34,5 @@
 "La proiezione non può essere letta dalle preferenze. Si utilizzerà EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -40,35 +40,35 @@
 "server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
-msgstr "Cambiamenti non salvati"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+msgstr "Modifiche non salvate"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr ""
-"Ci sono dei cambiamenti non salvati. Abbandonare i cambiamenti e continuare?"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+"Ci sono delle modifiche non salvate. Abbandonare le modifiche e continuare?"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Salva ed Esci"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Annulla ed Esci"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -79,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -93,4 +93,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -100,10 +101,10 @@
 msgstr "Annulla"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -129,8 +130,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -271,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -407,6 +408,6 @@
 msgstr "Inverti direzione e unisci"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -414,20 +415,20 @@
 msgstr "Inserire dei valori per tutti i conflitti."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Risolvi conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Unisci {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Tutti i percorsi erano vuoti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -531,5 +532,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -650,6 +651,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -658,6 +659,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -786,9 +787,9 @@
 msgstr "Incorpora comunque"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 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:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1065,5 +1066,5 @@
 msgstr "Salva i dati attuali."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1073,26 +1074,26 @@
 "questo come bug."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Documento vuoto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Il documento non contiene dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Salva comunque"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1102,32 +1103,32 @@
 "gestiti come se si fossero stati tutti rifiutati. Continuare?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Rifiuta i conflitti e Salva"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Salva in un file GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Salva file OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Impossibile creare una copia di backup."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "L'estensione del file è sconosciuta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Si è verificato un errore durante il salvataggio."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Errore durante il ripristino di un file di backup."
@@ -1185,18 +1186,18 @@
 msgstr "Chiudi"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Dividi percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Divide un percorso al nodo selezionato."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "La selezione attuale non può essere usata per la divisione."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1204,5 +1205,5 @@
 msgstr[1] "I nodi selezionati non sono parte di alcun percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1218,9 +1219,9 @@
 "percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "I nodi selezionati non condividono il medesimo percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1228,10 +1229,10 @@
 msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Seleziona due o più nodi per dividere un percorso circolare."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1241,5 +1242,5 @@
 "seleziona i nodi in mezzo al percorso)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1250,5 +1251,5 @@
 "Controllare ed eventualmente correggere."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1410,46 +1411,50 @@
 "desidera continuare?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Carica su OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Carica tutti i cambiamenti sul server OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Oggetti da aggiungere:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Oggetti da modificare:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Oggetti da eliminare:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Crea un breve commento ai cambiamenti che sta caricando:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Caricare questi cambiamenti?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Carica le modifiche"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Niente da caricare. Prima è necessario ottenere dei dati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Ci sono dei conflitti non risolti. Prima è necessario risolverli."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Nessun cambiamento da caricare."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Caricamento dei dati"
@@ -1636,31 +1641,33 @@
 msgstr "Non si può disegnare un nodo fuori dal mondo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Aggiungi nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Aggiungi un nodo al percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Collega un percorso esistente al nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Aggiungi un nodo ad un percorso esistente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Aggiungi un nodo al percorso e connetti"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Crea un nuovo nodo."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Seleziona il nodo sotto il cursore."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1669,9 +1676,4 @@
 msgstr[0] "Inserisci un nuovo nodo nel percorso."
 msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Seleziona il nodo sotto il cursore."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2108,5 +2110,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2304,5 +2306,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "ferrovia"
@@ -2324,127 +2326,127 @@
 msgstr[1] "{0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Il percorso dello stile dell''area non è chiuso."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "il percorso multi-poligonale ''{0}'' non è chiuso."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Membro vuoto nella relazione."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Eliminato il membro ''{0}'' nella relazione."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Percorso ''{0}'' con meno di due punti."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "E' stato trovato più di un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "E' stato trovato più di un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "E' stata trovata più di una \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ruolo ''{0}'' sconosciuto."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo di membro sconosciuto per ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Non è stato trovato un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Non è stato trovato un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "Non è stato trovato alcun nodo o percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Non è stato trovato lo stile per la restrizione {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Regola ''{0}'' non utile per il percorso ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-percorso ''{0}'' nel multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Nessun percorso esterno per il multi-poligono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Il percorso interno ''{0}'' è esterno."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Lo stile per il percorso esterno ''{0}'' è discordante."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "senza etichetta"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "testo"
@@ -2452,5 +2454,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2478,5 +2480,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "sfondo"
@@ -2543,5 +2545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2555,5 +2557,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2583,14 +2585,14 @@
 msgstr "versione risolta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Il messaggio del giorno non è disponibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "- la versione in esecuzione è {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Scaricamento del \"messaggio del giorno\""
@@ -2662,14 +2664,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Nome utente"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -2678,58 +2680,58 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "opzioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Mostra questo aiuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Scarica la zona delimitata dal riquadro di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Scarica la zona indicata dall'URL (interpretando lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Apri il file (come gps grezzo se .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr ""
 "Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Seleziona i risultati della ricerca della stringa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr "Lancia in modalità massimizzata"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Reimposta le preferenze predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Imposta la lingua."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "Esempi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2739,23 +2741,28 @@
 "quindi assicurati di caricare dei dati prima di indicare una selezione."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Invece di --download=<zona> puoi utilizzare osm://<zona>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Attivazione estensioni aggiornate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Caricamento vecchie estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Impostazioni predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Caricamento estensioni"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2935,5 +2942,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3146,5 +3153,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Ruolo"
@@ -3192,73 +3199,71 @@
 msgstr "Proprietà / Appartenenze"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Applica cambiamenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Crea nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Modifica nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Modifica la relazione #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Di base"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Occupato da"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Etichette (un valore vuoto cancella l'etichetta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Sposta in alto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Sposta in alto i membri attualmente selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Aggiungi la selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Aggiungi tutti gli oggetti selezionati come membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Elimina gli elementi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Rimuovi dalla relazione gli elementi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Sposta in basso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Sposta in basso i membri attualmente selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3267,37 +3272,37 @@
 msgstr "Elimina"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 "Cancella il membro dalla riga della tabella utilizzata da questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Scarica i membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Membri: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editor relazione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Si sono verificati dei conflitti durante l'importazione."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Errore di scansione nella risposta del server."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Impossibile connettersi al server."
@@ -3311,10 +3316,11 @@
 msgstr "Cancella le relazioni selezionate"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relazioni"
@@ -3511,5 +3517,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Luoghi"
@@ -3556,21 +3562,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "tipo"
@@ -3625,10 +3631,7 @@
 "premere Ctrl e le frecce, il punto (.) e la virgola (,)."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Mappa"
@@ -3782,4 +3785,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3885,5 +3889,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3947,19 +3951,34 @@
 "tracciato per poter essere giustamente calcolati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "al di fuori dell'area scaricata"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Versione {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} è composto da:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} eliminati)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "uso"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Versione {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3967,21 +3986,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4430,5 +4449,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4513,4 +4532,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4594,7 +4615,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4607,7 +4625,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4623,10 +4648,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4795,5 +4820,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4827,7 +4854,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4911,4 +4938,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4961,4 +4996,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4967,7 +5008,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4976,15 +5014,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -5009,129 +5036,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Nome"
@@ -5180,12 +5209,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Carica tutti i tasselli"
+msgstr "File locali"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zona"
+msgstr "Nessuno"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5213,45 +5240,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Automobile"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Bicicletta"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5259,25 +5276,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Pedone"
@@ -5326,7 +5348,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Disegna le linee tra i punti GPS grezzi."
+msgstr "Disegna le linee tra i punti GPS grezzi"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5982,10 +6003,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, è possibile che manchino delle etichette."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Preparazione dei dati in corso..."
@@ -5996,25 +6017,75 @@
 "Errore di scansione: struttura del documento non valida per un documento gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Apertura del changeset..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Chiusura del changeset..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Nessun cambiamento da caricare."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Preparazione in corso..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Invio in corso..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Errore di scansione nella risposta del server."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Host sconosciuto"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Nome utente o password errati."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Attenzione: la password è trasferita non cifrata."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Salva nome utente e password (non cifrata)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Inserire la password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -6025,35 +6096,43 @@
 msgstr "Errore nella scansione."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Versione sconosciuta"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Versione sconosciuta"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Trovato <nd> elemento in non-percorso."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> ha zero ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Trovato etichetta <member> su una non relazione."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "<member> incompleto, specificazione con ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Oggetto illegale con id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Attributo richiesto mancante \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
@@ -6061,9 +6140,9 @@
 "E'' stato ignorato un percorso perché include un nodo che non esiste: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Preparazione dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Id del nodo malformato"
@@ -6073,5 +6152,5 @@
 msgstr "Connessione al server in corso..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -6080,5 +6159,5 @@
 "internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6088,55 +6167,8 @@
 "aspetta prima di riprovare."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Crea un breve commento ai cambiamenti che sta caricando:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Inserisci commento"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} rimanenti. Caricamento di {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Un errore è stato generato: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Apertura del changeset..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Il server non supporta i changeset (API < 0.6)"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Host sconosciuto"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Preparazione in corso..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Invio in corso..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Chiusura del changeset..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6313,6 +6345,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "sconosciuto"
@@ -6385,5 +6417,5 @@
 msgstr ""
 "Il file dell''estensione è già disponibile in locale. Desideri scaricare la "
-"versione aggiornata e cancellare il vecchio archivio?\n"
+"versione aggiornata ed eliminare il vecchio archivio?\n"
 "\n"
 "{0}"
@@ -6502,7 +6534,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Crea aree"
+msgstr "Crea una griglia di percorsi"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6511,17 +6542,18 @@
 "in common"
 msgstr ""
+"Costruisce una griglia di percorsi prendendo in considerazione due esistenti "
+"composti da più nodi ed aventi un nodo in comune"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Seleziona due percorsi con un nodo in comune"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Seleziona due percorsi con solo un nodo in comune"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Crea aree"
+msgstr "Crea una griglia di percorsi"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6546,5 +6578,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Descrizione"
@@ -7831,7 +7863,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "acqua"
@@ -8143,5 +8175,5 @@
 msgstr "Ciclo di scaricamento di OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Visualizza segnalazioni OpenStreetBugs"
@@ -8161,4 +8193,11 @@
 msgstr "Attenzione"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Un errore è stato generato: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8188,35 +8227,38 @@
 "da OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Aggiungi un commento"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Inserire il proprio commento"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Imposta come completata"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Si vuole veramente impostare la segnalazione come \"completata\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Si vuole veramente chiudere la segnalazione?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Nuova segnalazione"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Crea segnalazione"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Descrivere il problema in modo preciso"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Crea segnalazione"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8245,5 +8287,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8253,9 +8295,9 @@
 "delle impostazioni della mappa nelle preferenze."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "Opzioni osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Eseguibile di Firefox"
@@ -8330,129 +8372,113 @@
 "indirizzo URL:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
+#. Add menu
+#. TODO Use constructor with shortcut
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
 msgstr "Navigazione"
 
-#. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Niente"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "Cliccare per aggiungere nodi all'itinerario."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Clicca per inserire un nuovo nodo."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "Cliccare e trascinare per spostare i nodi dell'itinerario."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Clicca per inserire un nuovo nodo."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "Cliccare per aggiungere nodi all'itinerario."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "Apri un elenco dei nodi dell'itinerario"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "Rimozione dei nodi duplicati in corso..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Apri tutte le relazioni in una lista"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Stazione"
+msgid "Add routing layer"
+msgstr "Aggiungi un nuovo livello"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "intermedia"
+msgstr "Criteri"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Calzature"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "Più breve"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Più veloce"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "Più rapido"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Inverti complesso"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr "Inverti l'itinerario"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Linea traghetto"
+msgstr "Cancella l'itinerario"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Preferenze dell'estensione WMS"
+msgstr "Preferenze dell'estensione di navigazione"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Configura i siti delle estensioni"
+msgstr "Configura le preferenze di navigazione."
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Uscita stradale"
+msgstr "Tipo strada"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Velocità massima (km/h)"
+msgstr "Velocità (Km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Modifica Albero"
+msgstr "Peso"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "Inserire i valori di peso"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Carica il tassello"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Mostra lo stato dei tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Richiesta di aggiornamento"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Carica tutti i tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Aumenta l'ingrandimento"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Diminuisci l'ingrandimento"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "immagine non caricata"
@@ -8475,34 +8501,34 @@
 msgstr "Impostazioni per l'estensione SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Sorgenti dei tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Auto zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Carica utomaticamente i tile: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Massimo livello di zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Smorza lo sfondo: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "errore nel caricamento dei metadati"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "richiesta: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "errore nella richiesta di aggiornamento"
@@ -8517,5 +8543,5 @@
 msgstr "Salva ogni minuto su file i dati acquisiti."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8572,7 +8598,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Modifica regione"
+msgstr "Modifica etichette"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8580,66 +8605,58 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Apre la finestra per la modifica delle etichette"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "Estensione JOSM per la modifica delle etichette"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "nessuno"
+msgstr "(nessuno/a)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "evidenzia"
+msgstr "In evidenza"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "polivalente"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr "<multiplo>"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Cambia le proprietà di al massimo {0} oggetto"
-msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] "Rimuovi le vecchie chiavi da {0} oggetto"
+msgstr[1] "Rimuovi le vecchie chiavi da {0} oggetti"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Cambia le proprietà di al massimo {0} oggetto"
-msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
+msgstr[0] "Aggiorna le proprietà di {0} oggetto"
+msgstr[1] "Aggiorna le proprietà di {0} oggetti"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "percorso"
+msgstr "Gruppo"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Torrente"
+msgstr "Elemento"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Cerca"
+msgstr "Cerca: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "File"
+msgstr "Filtro"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Automobile"
+msgstr "Cancella"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8728,5 +8745,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Nome Strada"
@@ -8826,24 +8843,21 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Aggiunto un nodo su tutte le intersezioni"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
+msgstr "Elimina i percorsi che non fanno parte di un multi-poligono interno"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relazione"
+msgstr "Correggi le relazioni"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Unisci aree sovrapposte"
+msgstr "L'area auto-sovrapposta è stata unita"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Unisci aree sovrapposte"
+msgstr "Le aree sovrapposte sono state unite"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8856,31 +8870,26 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Unisci i conflitti."
+msgstr "Correggi i conflitti di etichette"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Elimina dalla relazione"
+msgstr "Sono stati rimossi elementi dalle Relazioni"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Unisi Aree: Elimina le way corte"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Percorsi non chiusi."
+msgstr "Strada chiusa (anello)"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Rimuovi la fotografia dal layer"
+msgstr "Rimuovi i tag dalle way interne"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Motorway Junction"
+msgstr "Funzione di unione delle Aree"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9498,4 +9507,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9577,7 +9592,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "building"
@@ -9591,5 +9606,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "area"
@@ -9901,4 +9916,9 @@
 msgstr "non è possibile acquisire il flusso sonoro dall'URL di ingresso"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9934,7 +9954,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Crea aree"
+msgstr "Crea un reticolo di ways"
 
 #. Plugin DirectUpload
@@ -10051,21 +10070,28 @@
 "correntemente visibile."
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Il grande aspetto e stile JGoodies Plastic."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM."
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Fornisce funzioni di navigazione"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -10076,15 +10102,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permetti l'aggiunta di marcatori/nodi alle posizioni gps correnti."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
+msgstr "Fornisce un'interfaccia per l'editing dei tag in forma tabulare"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -10098,15 +10124,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr "Carica i file TCX direttamente da JOSM."
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce degli edifici a schiera a partire da singoli blocchi."
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -10118,5 +10144,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -10127,5 +10153,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -10137,5 +10163,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10227,5 +10253,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Riferimento"
@@ -10280,7 +10306,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Layer"
@@ -10323,5 +10349,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Velocità massima (km/h)"
@@ -10369,5 +10395,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Senso unico"
@@ -10423,5 +10449,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Ponte"
@@ -10471,5 +10497,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Galleria/tunnel"
@@ -10516,5 +10542,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Sbancamento"
@@ -10561,5 +10587,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Terrapieno"
@@ -10717,6 +10743,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Larghezza (metri)"
@@ -10765,5 +10791,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Superficie"
@@ -10795,5 +10821,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "pavimentata"
@@ -10804,5 +10830,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "non pavimentata"
@@ -10816,5 +10842,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "ciottoli (pavé)"
@@ -10966,5 +10992,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10985,6 +11011,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "si"
@@ -11128,7 +11154,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "no"
@@ -11142,73 +11168,63 @@
 msgstr "Merci pesanti/Trasporti eccezionali"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Cavallo"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motocicletta"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Automobile"
@@ -11283,130 +11299,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Tipo"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11414,5 +11318,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11420,11 +11324,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11432,5 +11330,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11438,5 +11336,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11444,5 +11342,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11450,6 +11348,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11468,6 +11372,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "motorway"
@@ -11493,6 +11397,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "trunk"
@@ -11518,6 +11422,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "primary"
@@ -11543,6 +11447,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "secondary"
@@ -11556,5 +11460,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "tertiary"
@@ -11572,5 +11476,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "residential"
@@ -11588,5 +11492,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "service"
@@ -11613,6 +11517,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "construction"
@@ -11653,6 +11557,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11663,5 +11566,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "rotatoria"
@@ -12005,14 +11908,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Operatore"
@@ -12037,20 +11940,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "non presidiato"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "Semaforo"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "isola spartitraffico"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "non marcato"
@@ -12058,5 +11961,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "attraversamento a cavallo"
@@ -12065,5 +11968,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "attraversamento ciclabile"
@@ -12073,5 +11976,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "Attraversamento controllato"
@@ -12220,10 +12123,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Elevazione"
@@ -12236,29 +12140,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Stile"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Modifica scaletta"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Colonnina"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Modifica colonnina"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12267,7 +12160,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12276,235 +12172,223 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Traffico permesso:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr "Barriera per biciclette"
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Blocco"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Griglia"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Modifica griglia"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "Trappola bus"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr "Spunzoni"
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr "Modifica spunzoni"
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Casello (per pedaggio)"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Modifica casello (per pedaggio)"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Dogana"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Modifica dogana"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Siepe"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Recinto"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Muro"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Cinta muraria"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Muro di contenimento"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Punto di accesso"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Modifica punto di accesso"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "Cancello"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "Modifica cancello"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "Cancello a sollevamento"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "Modifica cancello a sollevamento"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Cancello di filo spinato"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Modifica cancello di filo spinato"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Bump Gate"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Modifica un Bump Gate"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
 msgstr "Modifica un Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Cancello di filo spinato"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Modifica cancello di filo spinato"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Colonnina"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Modifica colonnina"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Ponte levatoio"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Modifica ponte levatoio"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "Trappola bus"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Griglia"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Modifica griglia"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr "Spunzoni"
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr "Modifica spunzoni"
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Saracinesca"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Modifica saracinesca"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "Cancello"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "Modifica cancello"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr "Cancello a sollevamento"
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr "Modifica cancello a sollevamento"
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Stile"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Modifica scaletta"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Porta di cinta muraria"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Modifica porta di cinta muraria"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Bump Gate"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Modifica un Bump Gate"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr "Barriera per biciclette"
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Siepe"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Recinto"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Blocco"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Muro"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Cinta muraria"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Muro di contenimento"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Casello (per pedaggio)"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Modifica casello (per pedaggio)"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Dogana"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Modifica dogana"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Punto di accesso"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Modifica punto di accesso"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Acqua"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Sorgente"
@@ -12512,5 +12396,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Modifica sorgente"
@@ -12518,5 +12402,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Canale di scolo"
@@ -12524,10 +12408,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Modifica un canale di scolo"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Torrente"
@@ -12535,10 +12419,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Modifica un torrente"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Canale"
@@ -12546,10 +12430,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Modifica un canale"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Fiume"
@@ -12559,5 +12443,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Modifica un fiume"
@@ -12565,15 +12449,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Modifica acqua"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Terraferma"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Modifica terraferma"
@@ -12581,15 +12465,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Bacino"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Modifica area di bacino"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Serbatoio"
@@ -12597,15 +12481,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Modifica area di riserva d'acqua"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Bacino coperto"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Modifica bacino coperto"
@@ -12613,5 +12497,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Argine"
@@ -12620,10 +12504,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Modifica un argine"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Zona umida"
@@ -12634,56 +12518,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Modifica zona umida"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "palude"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "torbiera"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "palude alluvionale"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "canneto"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "palude salata"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "barena"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "mangrovie"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Zona fangosa (sabbie mobili)"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Modifica zona fangosa (sabbie mobili)"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Spiaggia"
@@ -12691,20 +12575,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Modifica spiaggia"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Baia"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Modifica baia"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Rupe"
@@ -12712,10 +12596,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Modifica Rupe"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Linea di costa"
@@ -12723,5 +12607,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Modifica linea di costa"
@@ -12729,5 +12613,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Linea traghetto"
@@ -12735,5 +12619,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Modifica una linea traghetto"
@@ -12742,5 +12626,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Cantiere navale"
@@ -12748,10 +12632,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Modifica cantiere navale"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Darsena/bacino navale"
@@ -12759,5 +12643,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Modifica una darsena/bacino navale"
@@ -12765,5 +12649,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Diga"
@@ -12771,15 +12655,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Modifica una diga"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Punto di corso d'acqua"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Chiusa (non blocca la navigazione)"
@@ -12788,5 +12672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Sbarramento"
@@ -12794,20 +12678,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Modifica sbarramento"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Cascata"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Modifica una cascata"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Punto di inversione di marcia"
@@ -12816,15 +12700,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Porto turistico"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Modifica un porto turistico"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Passerella"
@@ -12832,10 +12716,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Modifica passerella"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Terminal traghetti"
@@ -12843,10 +12727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Modifica terminal traghetti"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Rampa per la messa in acqua di imbarcazioni"
@@ -12856,5 +12740,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Modifica una rampa per la messa in acqua di imbarcazioni"
@@ -12862,10 +12746,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Ferrovia"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Ferrovia"
@@ -12873,5 +12757,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Modifica una ferrovia"
@@ -12901,8 +12785,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Tipi opzionali"
@@ -12916,35 +12800,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "tratto per lo smistamento delle merci"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "tratto parallelo ad una ferrovia principale"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "tratto per una società o ente"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Ferrovia a scartamento ridotto"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Modifica una ferrovia a scartamento ridotto"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Monorotaia"
@@ -12952,45 +12836,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Modifica una monorotaia"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Ferrovia storica"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Modifica una ferrovia storica"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Metropolitana di superficie"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Modifica una metropolitana di superficie"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Metropolitana"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Modifica una metropolitana"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Tramvia"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Modifica una tramvia"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Rotaie del bus"
@@ -12998,5 +12882,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Modificare le rotaie del bus"
@@ -13005,14 +12889,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Ferrovia in disuso"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Modifica una ferrovia in disuso"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Ferrovia abbandonata"
@@ -13021,5 +12905,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Passaggio a livello"
@@ -13028,5 +12912,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Crossing"
@@ -13036,5 +12920,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr "Tipo di attraversamento"
@@ -13042,5 +12926,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Piattaforma ferroviaria girevole"
@@ -13049,10 +12933,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Impianto di risalita"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Seggiovia"
@@ -13060,10 +12944,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Modifica una seggiovia"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Ski-lift"
@@ -13071,10 +12955,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Modifica uno ski-lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Cabinovia"
@@ -13082,24 +12966,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Modifica una cabinovia"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Modifica Golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Stazione"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Modifica stazione"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Stazione di rifornimento"
@@ -13109,5 +13006,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Modifica una stazione di rifornimento"
@@ -13123,5 +13020,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -13131,5 +13028,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Modifica parcheggio"
@@ -13137,40 +13034,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Capacità"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "superficie"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "multi-piano"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "sotterraneo"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "parcheggio di interscambio"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Spazi per disabili"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Tariffa"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Autolavaggio"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Modifica autolavaggio"
@@ -13178,5 +13076,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Negozio"
@@ -13184,15 +13082,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Concessionaria"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Autofficina"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Modifica autofficina"
@@ -13200,5 +13098,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Noleggio"
@@ -13207,10 +13105,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Modifica noleggio automobili"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Condivisione"
@@ -13218,5 +13116,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Modifica condivisione automobili"
@@ -13224,5 +13122,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Modifica parcheggio per biciclette"
@@ -13231,5 +13129,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Modifica noleggio biciclette"
@@ -13238,15 +13136,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Modifica negozio di biciclette"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Trasporto pubblico"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "Riferimento UIC"
@@ -13254,5 +13152,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Stazione ferroviaria non presidiata"
@@ -13260,5 +13158,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Modifica stazione non presidiata"
@@ -13266,5 +13164,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Fermata del tram"
@@ -13273,5 +13171,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Modifica fermata del tram"
@@ -13279,5 +13177,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Piattaforma ferroviaria"
@@ -13286,5 +13184,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Modifica una piattaforma ferroviaria"
@@ -13296,5 +13194,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "Riferimento (numero del tracciato)"
@@ -13302,10 +13200,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Ingresso metropolitana"
@@ -13314,10 +13212,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Modifica ingresso metropolitana"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Sedia a rotelle"
@@ -13326,5 +13224,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Stazione degli autobus"
@@ -13333,5 +13231,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Modifica una stazione degli autobus"
@@ -13339,5 +13237,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Fermata dell'autobus"
@@ -13347,5 +13245,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Modifica fermata dell'autobus"
@@ -13353,10 +13251,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Piattaforma fermata bus"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Modifica una piattaforma degli autobus"
@@ -13364,5 +13262,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13370,5 +13268,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Stazione dei taxi"
@@ -13376,5 +13274,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Aeroporto"
@@ -13382,15 +13280,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Modifica aeroporto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13399,5 +13297,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Alloggiamento"
@@ -13409,5 +13307,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -13416,15 +13314,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Modifica hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Stelle"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motel"
@@ -13432,20 +13330,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Modifica Motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -13453,10 +13351,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Modifica casetta (chalet)"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Ostello"
@@ -13464,30 +13362,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Modifica ostello"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -13495,10 +13393,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Modifica campeggio"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -13509,5 +13407,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ristorante"
@@ -13515,5 +13413,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Modifica ristorante"
@@ -13521,5 +13419,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Cucina"
@@ -13527,61 +13425,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "reginale"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Fast food"
@@ -13589,9 +13487,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -13599,10 +13497,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Pub"
@@ -13610,20 +13508,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "Bar"
@@ -13631,10 +13529,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -13642,20 +13540,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
@@ -13664,11 +13562,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Orario di apertura"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "Museo"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "Modifica museo"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "Zoo"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "Modifica zoo"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "Punto panoramico"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "Modifica punto panoramico"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Torre di avvistamento"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "Parco divertimenti"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "Modifica parco divertimenti"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "Opera d'arte"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "Modifica opera d'arte"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "Ufficio informazioni"
@@ -13676,143 +13635,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
 msgstr "Modifica ufficio informazioni"
 
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "Museo"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "Modifica museo"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "Zoo"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "Modifica zoo"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "Punto panoramico"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "Modifica punto panoramico"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Torre di avvistamento"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "Parco divertimenti"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "Modifica parco divertimenti"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "Opera d'arte"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "Modifica opera d'arte"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr "Tipo di mappa"
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr "mappa"
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr "mappa cittadina"
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr "mappa escursionistica"
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr "mappa ciclistica"
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr "Descrizione più specifica"
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr "Tabellone informativo"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr "Tipo di tabellone"
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr "tavola"
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr "storia"
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr "natura"
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr "fauna"
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr "Cartello di indicazioni (escursionismo)"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr "Tipo di mappa"
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr "mappa"
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr "mappa cittadina"
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr "mappa escursionistica"
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr "mappa ciclistica"
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr "Descrizione più specifica"
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr "Tabellone informativo"
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr "Tipo di tabellone"
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr "tavola"
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr "storia"
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr "natura"
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr "fauna"
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
@@ -13820,25 +13719,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Caminetto"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Castello"
@@ -13847,20 +13746,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -13869,20 +13768,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Campo di battaglia"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Modifica campo di battaglia"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Memoriale"
@@ -13890,56 +13801,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Campo di battaglia"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Modifica campo di battaglia"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Modifica Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Parco giochi"
@@ -13947,15 +13847,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
@@ -13963,15 +13863,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -13985,6 +13885,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -14063,4 +13963,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14352,28 +14260,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "sport"
@@ -14383,227 +14292,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "tiro con l'arco"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "sport_equestri"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "football_americano"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -14642,191 +14551,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "campo_sportivo"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "centro_sportivo"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadio"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Tiro con l'arco"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Modifica tiro con l'arco"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Ciclismo"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Sci"
@@ -14834,56 +14743,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "intermedia"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -14891,178 +14802,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Sport (Pallone)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Modifica football"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Modifica Rugby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Edifici"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Palazzo"
@@ -15070,5 +14981,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -15076,10 +14987,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Municipio"
@@ -15087,10 +14998,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Modifica Municipio"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -15098,10 +15009,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -15110,10 +15021,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Prigione"
@@ -15122,10 +15033,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Polizia"
@@ -15135,10 +15046,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -15147,10 +15058,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -15158,5 +15069,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -15164,15 +15075,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Asilo"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Modifica Asilo"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Scuola"
@@ -15180,10 +15091,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Modifica Scuola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Università"
@@ -15191,10 +15102,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Scuola superiore"
@@ -15202,5 +15113,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Modifica Scuola superiore"
@@ -15208,5 +15119,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Cinema"
@@ -15215,10 +15126,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Biblioteca"
@@ -15227,10 +15138,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -15238,10 +15149,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d'arte"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Teatro"
@@ -15250,10 +15161,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -15263,5 +15174,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -15270,6 +15181,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Religione"
@@ -15278,66 +15189,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "bahaismo"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "induismo"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "giainismo"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "taoismo"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "unitarianismo"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "zoroastrismo"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Denominazione"
@@ -15346,81 +15258,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "sciismo"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "sunnismo"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -15429,5 +15341,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
@@ -15435,5 +15347,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Numero civico"
@@ -15441,20 +15353,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Codice nazione"
@@ -15462,5 +15374,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -15469,5 +15381,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
@@ -15475,67 +15387,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "tutti"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "atletica"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Costruzioni umane"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Faro"
@@ -15543,10 +15460,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -15554,10 +15471,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -15565,10 +15482,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -15578,10 +15495,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Gru permanente"
@@ -15589,10 +15506,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Torre radio"
@@ -15600,10 +15517,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -15611,10 +15528,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -15622,5 +15539,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
@@ -15628,5 +15545,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -15636,39 +15553,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -15677,10 +15594,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -15689,5 +15606,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -15695,10 +15612,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "Riferimento linea"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -15709,5 +15626,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
@@ -15715,5 +15632,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Linea elettrica"
@@ -15722,25 +15639,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Modifica linea elettrica"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Tensione"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Numero di linee"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Bagni"
@@ -15748,25 +15665,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Numero di riferimento"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Costo"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telefono"
@@ -15775,5 +15687,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -15781,5 +15693,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Monete"
@@ -15787,5 +15699,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Note"
@@ -15793,5 +15705,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -15799,5 +15711,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -15805,15 +15717,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -15822,5 +15734,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -15828,35 +15740,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Panchina"
@@ -15865,20 +15777,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Nascondi"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Blocco"
@@ -15886,22 +15798,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Fontana"
@@ -15910,10 +15822,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -15922,10 +15834,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -15933,25 +15845,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -15959,10 +15871,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Modifica minimarket"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -15970,10 +15882,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Modificia Chiosco"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -15981,5 +15893,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
@@ -15987,88 +15899,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Macellaio"
@@ -16076,10 +15988,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Modifica Macellaio"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Panificio"
@@ -16087,10 +15999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Modifica Panificio"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Fiorista"
@@ -16098,70 +16010,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Modifica Fiorista"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Scuola"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Modifica Negozio di Scarpe"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Modifica Negozio di Bevande"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -16169,10 +16095,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Modifica giardinaggio"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -16180,10 +16106,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "Modifica Negozio di Ferramenta"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -16191,60 +16117,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifica negozio Fai-da-te"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "Videoteca"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -16252,10 +16178,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Modifica Lavanderia a secco"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -16263,10 +16189,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Modifica lavanderia"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Sport all'aperto"
@@ -16274,35 +16200,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Modifica sport all'aperto"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "Articoli sportivi"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Sport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "Ottico"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Banca"
@@ -16310,5 +16238,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Modifica banca"
@@ -16316,10 +16244,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -16327,5 +16255,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
@@ -16333,15 +16261,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -16349,20 +16277,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -16370,5 +16298,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
@@ -16376,10 +16304,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Ospedale"
@@ -16387,10 +16315,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -16399,5 +16327,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "Modifica Colonnina SOS"
@@ -16406,20 +16334,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -16427,5 +16355,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -16434,25 +16362,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Stato"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Modifica stato"
@@ -16460,45 +16388,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Regione"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Provincia"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Città"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Paese"
@@ -16506,10 +16435,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Modifica Paese"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Sobborgo"
@@ -16517,30 +16446,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Modifica Sobborgo"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Frazione"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Modifica Frazione"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Modifica Borgo"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Luogo che ha un nome, ma non popolato"
@@ -16548,10 +16478,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Località"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Isola"
@@ -16559,5 +16489,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Modifica isola"
@@ -16565,5 +16495,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -16571,10 +16501,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -16582,10 +16512,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -16593,10 +16523,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Vulcano"
@@ -16604,70 +16534,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Nazionale"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Civile"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr "Politico"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Albero"
@@ -16676,15 +16606,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Bosco"
@@ -16693,5 +16623,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Modifica bosco"
@@ -16699,17 +16629,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Foresta"
@@ -16718,19 +16648,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Ghiaione"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Modifica Ghiaione"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Boscaglia"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Modifica boscaglia"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Fell"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Modifica Fell"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Brughiera"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Modifica brughiera"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Aia"
@@ -16739,45 +16713,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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "Prato"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -16785,25 +16759,26 @@
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Giardino"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Erba"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "Village Green"
@@ -16811,10 +16786,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Common (UK)"
@@ -16822,20 +16797,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Modifica una Common (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Parco"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -16843,5 +16818,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -16849,15 +16824,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Residential Landuse"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Modifica Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -16865,9 +16840,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -16875,39 +16850,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -16915,114 +16890,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Militare"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Modifica area militare"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Area in costruzione"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Modifica area in costruzione"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Ridestinazione d'uso"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d'uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Area in costruzione"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Modifica area in costruzione"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Cava"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Militare"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Modifica area militare"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Ghiaione"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Modifica Ghiaione"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Boscaglia"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Modifica boscaglia"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Fell"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Modifica Fell"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Brughiera"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Modifica brughiera"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -17032,5 +16964,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -17039,10 +16971,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "segmento esterno"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "segmento interno"
@@ -17050,5 +16982,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -17057,5 +16989,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -17063,34 +16995,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -17099,15 +17031,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "verso il percorso"
@@ -17115,5 +17047,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Percorso"
@@ -17122,5 +17054,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "Modifica un percorso"
@@ -17128,5 +17060,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Tipo di percorso"
@@ -17198,24 +17130,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "bicicletta"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "sci"
@@ -17260,4 +17192,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17267,19 +17202,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "pedone"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "escursionismo"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "deviazione"
@@ -17293,10 +17229,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -17304,26 +17240,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -17332,30 +17268,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "segmento di percorso"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -17539,4 +17475,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17548,4 +17591,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17647,11 +17699,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "deprecato"
@@ -17693,7 +17747,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "cavallo"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Barriere"
 
 #. color tertiary
@@ -17729,6 +17998,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "strada"
@@ -17784,7 +18053,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "tracciato_stradale"
@@ -17831,108 +18100,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "ferrovia"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viadotto"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17949,4 +18131,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "service"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17956,4 +18144,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Guado"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17970,8 +18164,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "slargo per inversione di marcia"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "Colonnina SOS"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17983,5 +18191,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "sponda"
@@ -17995,5 +18203,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "torrente"
@@ -18007,5 +18215,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "darsena"
@@ -18033,5 +18241,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "acquedotto"
@@ -18046,4 +18254,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18083,5 +18292,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18198,12 +18407,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "costruzioni umane"
@@ -18249,5 +18459,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18265,7 +18475,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr "punto ferroviario"
@@ -18288,10 +18498,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr "altro_ferrovia"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr "ferrovia (sopra)"
@@ -18321,6 +18531,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr "vecchia_ferrovia"
@@ -18365,6 +18575,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "aeroporto"
@@ -18378,5 +18588,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminal"
@@ -18398,5 +18608,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "aeroporto (scuro)"
@@ -18410,5 +18620,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "aeroporto (chiaro)"
@@ -18431,4 +18641,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18448,4 +18666,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "struttura_di_risalita"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18454,23 +18678,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "struttura_di_risalita"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "pista_facile"
@@ -18484,5 +18695,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "pista_intermedia"
@@ -18496,5 +18708,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "pista_avanzata"
@@ -18507,6 +18720,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "pista_libera"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "pista_libera"
@@ -18520,5 +18748,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "pista_principiante"
@@ -18549,4 +18778,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18581,4 +18818,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18591,8 +18852,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "elettricità"
@@ -18605,5 +18868,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "pontile"
@@ -18617,5 +18883,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "conduttura"
@@ -18743,12 +19009,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "struttura per lo svago"
@@ -18762,5 +19028,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "porto turistico"
@@ -18832,8 +19098,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "struttura di servizio"
@@ -18869,4 +19135,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18926,11 +19200,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "servizio al traffico"
@@ -19069,6 +19343,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19295,22 +19590,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "struttura di servizio (chiaro)"
@@ -19342,6 +19637,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "acqua (chiaro)"
@@ -19377,4 +19672,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19394,7 +19697,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "salute"
@@ -19488,4 +19792,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19688,4 +20000,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19719,28 +20047,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "negozio"
@@ -19794,4 +20124,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19804,8 +20142,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotel"
@@ -19860,4 +20198,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19954,9 +20293,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "turismo"
@@ -20028,8 +20367,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "attrazione storica"
@@ -20099,9 +20438,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "verde"
@@ -20115,5 +20454,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "cava/miniera"
@@ -20127,5 +20466,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "discarica"
@@ -20147,5 +20486,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "bacino"
@@ -20159,5 +20498,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "foresta"
@@ -20171,5 +20510,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "aia"
@@ -20192,5 +20531,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "area commerciale (negozi)"
@@ -20204,5 +20543,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "industriale"
@@ -20216,5 +20555,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "ridestinazione d'uso"
@@ -20228,5 +20567,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -20240,5 +20579,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "area ferroviaria"
@@ -20295,7 +20634,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "militare"
@@ -20309,5 +20648,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "cimitero"
@@ -20320,5 +20659,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "picco montuoso"
@@ -20333,5 +20672,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "ghiacciaio"
@@ -20345,5 +20684,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "vulcano"
@@ -20358,4 +20697,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20397,7 +20737,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "elemento naturale"
@@ -20411,5 +20752,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "boscaglia"
@@ -20423,5 +20764,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "brughiera"
@@ -20435,5 +20776,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "bosco"
@@ -20447,5 +20788,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -20459,5 +20800,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "spiaggia"
@@ -20535,8 +20876,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "percorso"
@@ -20584,7 +20925,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "confine"
@@ -20726,10 +21067,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "luogo"
@@ -20770,6 +21111,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "indirizzo"
@@ -21051,327 +21399,51 @@
 msgstr "Geofabrik.de delle strade del Nord Reno-Westfalia"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "Se il dispositivo GPS disegna poche linee, selezionare questo per "
-#~ "disegnare le linee lungo il percorso."
-
-#~ msgid "Navigate"
-#~ msgstr "Naviga"
-
-#~ msgid "Navigator"
-#~ msgstr "Navigatore"
-
-#~ msgid "Set start/end for routing. Middle mouse button to reset."
-#~ msgstr ""
-#~ "Specifica l'inizio e la fine dell'itinerario. Premere il tasto mediano "
-#~ "del mouse per reimpostare."
-
-#~ msgid "Reset Graph"
-#~ msgstr "Reimposta il grafico"
-
-#~ msgid "Provides navigation/autorouting functionality"
-#~ msgstr "Mette a disposizione la funzionalità di navigazione"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Selezionare qualcosa dalla lista dei conflitti."
-
-#~ msgid "Please select a color."
-#~ msgstr "Scegliere un colore."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Non avviare a pieno schermo"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Novità su JOSM"
-
-#~ msgid "OSM History Information"
-#~ msgstr "Cronologia elementi OSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Clicca per creare un nuovo percorso al nodo esistente."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Clicca per collegare ad un nodo esistente."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Clicca per inserire un nodo e creare un nuovo percorso."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Clicca per inserire un nuovo nodo e creare un collegamento."
-
-#~ msgid "Search ..."
-#~ msgstr "Cerca ..."
-
-#~ msgid " ({0} node)"
-#~ msgid_plural " ({0} nodes)"
-#~ msgstr[0] " ({0} nodo)"
-#~ msgstr[1] " ({0} nodi)"
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr "Seleziona gli oggetti dei quali vuoi cambiare le proprietà."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "Questo è un semplice editor delle relazioni che permette di modificare le "
-#~ "etichette e i membri delle relazioni. In aggiunta a questo si dovrebbe "
-#~ "avere un editor più avanzato che rilevi il tipo di relazione e che limiti "
-#~ "le scelte dell'utente in modo sensibile."
-
-#~ msgid "Highlight the member from the current table row as JOSM's selection"
-#~ msgstr ""
-#~ "Evidenzia il membro dalla riga della tabella utilizzata come una "
-#~ "selezione di JOSM"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Carica questa traccia..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Questa funzionalità è stata aggiunta di recente.<br>Usare con "
-#~ "prudenza e controllare il suo corretto funzionamento.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Carica il percorso filtrato da JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Carica il file grezzo: "
-
-#~ msgid "Description:"
-#~ msgstr "Descrizione:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Etichette (keywords in GPX):"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "Carica-GPX"
-
-#~ msgid "time"
-#~ msgstr "orario"
-
-#~ msgid "desc"
-#~ msgstr "descr."
-
-#~ msgid "symbol"
-#~ msgstr "simbolo"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Carica il file: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Etichette:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr ""
-#~ "Scegli la tinta per il tracciato colorato in base alla velocità in quel "
-#~ "punto."
-
-#~ msgid "Unknown type"
-#~ msgstr "Unknown type"
-
-#~ msgid "NullPointerException, Possibly some missing tags."
-#~ msgstr "NullPointerException, è possibile che manchino delle etichette."
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Scaricamento {0} {1} (id: {2}) {3}% {4}/{5} (manca {6})..."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Modifica una uscita"
-
-#~ msgid "Exit Number"
-#~ msgstr "Numero dell'uscita"
-
-#~ msgid "Exit Name"
-#~ msgstr "Nome dell'uscita"
-
-#~ msgid "Waterway"
-#~ msgstr "Waterway"
-
-#~ msgid "Information point"
-#~ msgstr "Punto informazioni"
-
-#~ msgid "Provider"
-#~ msgstr "Fornitore"
-
-#~ msgid "political"
-#~ msgstr "Politico"
-
-#~ msgid "National_park"
-#~ msgstr "Parco nazionale"
-
-#~ msgid "Natural"
-#~ msgstr "Elementi naturali"
-
-#~ msgid "Add Site"
-#~ msgstr "Aggiungi sito"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Elimina siti"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Selezionare il sito da eliminare."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Verifica siti"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Selezionare i siti da controllare per gli aggiornamenti."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Aggiungi un nuovo sito di estensioni."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Elimina i siti selezionati nella lista."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr "Cerca nuove estensioni o aggiornamenti nei siti selezionati."
-
-#~ msgid "Update Sites"
-#~ msgstr "Aggiorna il luogo"
-
-#~ msgid "Version"
-#~ msgstr "Versione"
-
-#~ msgid "Install"
-#~ msgstr "Installa"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Versione: {0}<br>Ultima modifica {1}"
-
-#~ msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-#~ msgstr "L'estensione Surveyor dipende dall'estensione LiveGps."
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr "Estensione LiveGps non trovata, installarla e attivarla."
-
-#~ msgid "SurveyorPlugin is disabled for the moment"
-#~ msgstr "L'estensione Surveyor è momentaneamente disabilitata"
-
-#~ msgid "SurveyorPlugin"
-#~ msgstr "EstensioneSurveyor"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Versione {0} - Ultima modifica il {1}"
-
-#~ msgid "Duplicated nodes."
-#~ msgstr "Nodi duplicati."
-
-#~ msgid "Similar named ways."
-#~ msgstr "Percorsi con nomi simili."
-
-#~ msgid "Open waypoints file"
-#~ msgstr "Apri un file contenente punti del percorso"
-
-#~ msgid "Open a waypoints file."
-#~ msgstr "Apre un file contenente punti del percorso."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "Errore nei dati: il valore lat \"{0}\" è fuori limite."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "Errore nei dati: il valore lon \"{0}\" è fuori limite."
-
-#~ msgid ""
-#~ "<html>Fulltext search:<ul><li><b>Baker Street</b> - 'Baker' and 'Street' "
-#~ "in any key or name.</li><li><b>\"Baker Street\"</b> - 'Baker Street' in "
-#~ "any key or name.</li><li><b>name:Bak</b> - 'Bak' anywhere in the name.</"
-#~ "li><li><b>-name:Bak</b> - not 'Bak' in the name.</li><li><b>foot:</b> - "
-#~ "key=foot set to any value.</li><li>Special targets:</li><li><b>type:</b> "
-#~ "- type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)</"
-#~ "li><li><b>user:</b>... - all objects changed by user</li><li><b>id:</"
-#~ "b>... - object with given ID</li><li><b>nodes:</b>... - object with given "
-#~ "number of nodes</li><li><b>modified</b> - all changed objects</"
-#~ "li><li><b>selected</b> - all selected objects</li><li><b>incomplete</b> - "
-#~ "all incomplete objects</li><li>Use <b>|</b> or <b>OR</b> to combine with "
-#~ "logical or</li><li>Use <b>\"</b> to quote operators (e.g. if key "
-#~ "contains :)</li><li>Use <b>(</b> and <b>)</b> to group expressions</li></"
-#~ "ul></html>"
-#~ msgstr ""
-#~ "<html>Ricerca del testo completa:<ul><li><b>Via Nazionale</b> - "
-#~ "''Nazionale'' e ''Via'' in qualsiasi chiave o nome.</li><li><b>\"Via "
-#~ "Nazionale\"</b> - ''Via Nazionale'' in qualsiasi chiave o nome.</"
-#~ "li><li><b>name:Naz</b> - ''Naz'' in qualsiasi punto nel nome.</li><li><b>-"
-#~ "name:Naz</b> - ''Naz'' non presente nel nome.</li><li><b>foot:</b> - "
-#~ "chiave=foot impostata con qualsiasi valore.</li><li>Ricerche speciali:</"
-#~ "li><li><b>type:</b> - tipo dell''oggetto (<b>node</b>, <b>way</b>, "
-#~ "<b>relation</b>)</li><li><b>user:</b>... - tutti gli oggetti modificati "
-#~ "dall''utente</li><li><b>id:</b>... - oggetto con l''identificativo dato</"
-#~ "li><li><b>nodes:</b>... - oggetto con un dato numero di nodi</"
-#~ "li><li><b>modified</b> - tutti gli oggetti modificati</"
-#~ "li><li><b>selected</b> - tutti gli oggetti selezionati</"
-#~ "li><li><b>incomplete</b> - tutti gli oggetti incompleti</li><li>Usare <b>|"
-#~ "</b> oppure <b>OR</b> per combinare la ricerca con l''operatore logico "
-#~ "or</li><li>Usare <b>\"</b> per racchiudere gli operatori (es. se la "
-#~ "chiave contiene :)</li><li>Usare <b>(</b> e <b>)</b> per raggruppare le "
-#~ "espressioni</li></ul></html>"
-
-#~ msgid "Add Node"
-#~ msgstr "Aggiungi nodo"
-
-#~ msgid "Signpost"
-#~ msgstr "Indicazione"
-
-#~ msgid "office"
-#~ msgstr "ufficio"
-
-#~ msgid "guidepost"
-#~ msgstr "indicazione stradale"
-
-#~ msgid "NoName"
-#~ msgstr "SenzaNome"
-
-#~ msgid "Ref"
-#~ msgstr "Riferimento"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Aggiorna URL del sito"
-
-#~ msgid "Invalid URL"
-#~ msgstr "URL non valido"
-
-#~ msgid "unusual named way type"
-#~ msgstr "tipo di percorso con nome insolito"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Scaricamento del \"Messaggio del giorno\"..."
-
-#~ msgid "Open map features in browser"
-#~ msgstr "Apri le caratteristiche della mappa nel browser"
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "Il percorso \"{0}\" deve contenere almeno 2 nodi."
-
-#~ msgid "Upload GPX track"
-#~ msgstr "Carica tracciato GPX"
-
-#~ msgid "Direct Upload to OpenStreetMap"
-#~ msgstr "Caricamento diretto su OpenStreetMap"
-
-#~ msgid "Starting to upload selected file to openstreetmap.org"
-#~ msgstr "Inizio del caricamento dei file selezionati su openstreetmap.org"
-
-#~ msgid "Transferring data to server"
-#~ msgstr "Trasferimento dei dati sul server in corso"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "Quanti edifici ci sono nel complesso?"
-
-#~ msgid "Update available"
-#~ msgstr "Aggiornamento disponibile"
-
-#~ msgid "Version Details:"
-#~ msgstr "Dettagli della versione:"
-
-#~ msgid ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
-#~ msgstr ""
-#~ "Proprio: {2}; Corrente: {0}; <font style=\"font-size:x-small\">(ultimo "
-#~ "non testato: {1} &#150; non consigliato)</font>"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Apri..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Descrizione"
+
+#~ msgid "Commit comment"
+#~ msgstr "Inserisci commento"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Il server non supporta i changeset (API < 0.6)"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Si vuole veramente impostare la segnalazione come \"completata\"?"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigazione"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "Rimuovi nodi dell'itinerario"
+
+#~ msgid "Start routing"
+#~ msgstr "Inizia navigazione"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Ponte levatoio"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Modifica ponte levatoio"
+
+#~ msgid "Portcullis"
+#~ msgstr "Saracinesca"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Modifica saracinesca"
+
+#~ msgid "Charge"
+#~ msgstr "Costo"
+
+#~ msgid "sports"
+#~ msgstr "Articoli sportivi"
+
+#~ msgid "viaduct"
+#~ msgstr "viadotto"
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/ja.po	(revision 14844)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-27 20:55+0000\n"
-"Last-Translator: MAPconcierge <taichi@mapconcierge.jp>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-21 12:23+0000\n"
+"Last-Translator: nazotoko <shunw@ics.uci.edu>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
@@ -36,39 +36,39 @@
 msgstr "投影法が設定から読み取れませんでした。EPSG:4326を使用します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れます。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "保存されていない変更"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "保存されていない変更があります。変更分を破棄して継続しますか？"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "保存して終了"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "変更を破棄して終了"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -79,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -93,4 +93,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -100,10 +101,10 @@
 msgstr "キャンセル"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "不正な形式のURLの\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -129,8 +130,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -271,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -405,6 +406,6 @@
 msgstr "逆転して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -412,20 +413,20 @@
 msgstr "すべての競合に値を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0}ウェイを結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "ウェイが全て空です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -529,5 +530,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -648,6 +649,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -656,6 +657,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -771,5 +772,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
 msgid "Merge nodes with different memberships?"
-msgstr ""
+msgstr "異なったメンバーになっているノードを結合しますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149
@@ -783,10 +784,10 @@
 msgstr "強制的に結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -959,5 +960,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
 msgid "Please select ways with almost right angles to orthogonalize."
-msgstr ""
+msgstr "ほぼ垂直になっているウェイを選択してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95
@@ -1062,5 +1063,5 @@
 msgstr "最新データを保存します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1070,26 +1071,26 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "一つも開かれたデータがありませんんで、保存されません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "空の文書"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "文書にデータが含まれない"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "それでも保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1099,32 +1100,32 @@
 "れます。続けますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "競合を否定して保存する"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "GPXファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "OSMファイルの保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "ファイルをバックアップできませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "ファイルの拡張子が不明です"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "保存中にエラー発生"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "バックアップファイルから復元するときに、エラーになりました。"
@@ -1181,23 +1182,23 @@
 msgstr "閉じる"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "ウェイを分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "選択したノードでウェイを分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "現在の選択は分割できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "選択したノードは、いずれかのウェイの中間ではありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1210,15 +1211,15 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "選択したノードは同じウエイで共有されていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
 msgstr[0] "選択したウエイは選択したノードをつかって構成されていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -1226,5 +1227,5 @@
 "す。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1234,11 +1235,14 @@
 "する）"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
 "You should verify this and correct it when necessary."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+"リレーションのメンバーが持つロールは、新しい全てのウェイにコピーされまし"
+"た。\n"
+"確認して、必要なら訂正してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1395,46 +1399,50 @@
 msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "OSMにアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "OSMサーバにすべての変更をアップロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "追加するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "修正するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "削除するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "アップロードする変更の概略コメントを入力してください。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "この変更をアップロードしますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "変更のアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "未解決の競合があります。まずこれらの競合を解決してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "アップロードする変更はありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "アップロードするデータ"
@@ -1619,36 +1627,27 @@
 msgstr "世界の外にノードを追加できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "ノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "ノードでウェイに追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "既存のウェイをノードとつなぎます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "既存のウェイに新しいノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "ウェイのノードを追加して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "新規ノードの作成"
-
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
-#, java-format
-msgid "Insert new node into way."
-msgid_plural "Insert new node into {0} ways."
-msgstr[0] "新規ノードを {0}このウエイに追加します。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
@@ -1657,4 +1656,10 @@
 msgstr "カーソルの下のノードを選択"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] "新規ノードを {0}このウエイに追加します。"
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Start new way from last node."
@@ -1706,4 +1711,6 @@
 "+release to synchronize audio at that point."
 msgstr ""
+"再生の先頭へドラッグするか、音声をトラックの近くで離してください。; SHIFTキー"
+"を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
@@ -1729,4 +1736,6 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
+"移動を止めるには、マウスのボタンを放してください。Ctrlキーで、近くのノードと"
+"マージします。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
@@ -1735,4 +1744,6 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
+"ドラッグでオブジェクトを動かす;Shiftキーで、選択を加える。(Ctrlキーで切り替"
+"え);Shft-Ctrlで選択を回転。;選択を変更。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
@@ -1806,13 +1817,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr ""
+msgstr "<b>name:Bak</b> - 'Bak' その名前のどこか。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr ""
+msgstr "<b>-name:Bak</b> - その名前の内 'Bak' でない。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
+msgstr "<b>foot:</b> - key=任意の値を入力してください."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
@@ -1860,5 +1871,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-msgstr ""
+msgstr "<b>\"</b> を演算子をくくるために使ってください。（例：キーが：を含む)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
@@ -1883,10 +1894,10 @@
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
-msgstr ""
+msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr ""
+msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
@@ -1914,4 +1925,8 @@
 "{2}"
 msgstr ""
+"正規表現 \"{0}\" は、オフセット {1} に区切りエラーがあります。全エラーメッ"
+"セージは:\n"
+"\n"
+"{2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:361
@@ -2065,5 +2080,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2256,5 +2271,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "鉄道"
@@ -2275,127 +2290,127 @@
 msgstr[0] "{0}ノード"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "領域を指定するウエイが閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "リレーションに登録すべきものがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "メンバー \"{0}\"を関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "ウエイ\"{0}\"は二つ未満のポイントです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "二つ以上の\"from\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "経由地が複数有ります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明なロール\"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "{0}のメンバーのタイプが不明"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "\"from\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "\"to\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "経由地かウエイが見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"to\"のウエイは\"via\"のノードで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"from\" のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"to\"のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "制約条件{0}のスタイルがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "ウエイ \"{0}\"と\"{1}\"の交差する点"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "内部のウェイ ''{0}''が外側にあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "タグ付いていない"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "テキスト"
@@ -2403,5 +2418,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2428,5 +2443,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "背景"
@@ -2493,5 +2508,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2505,5 +2520,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2532,14 +2547,14 @@
 msgstr "解決したバージョン:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "今日のメッセージはありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "- 起動中のバージョンは {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "\"今日のメッセージ\"をダウンロード"
@@ -2611,71 +2626,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "ユーザ名"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "bounding boxをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "ファイルを開く（.gpxの場合生のGPSとして)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "言語の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2683,23 +2698,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "--download=<bbox>のかわりに osm://<bbox>を指定できます。\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "アップデートしたプラグインの活性化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "プラグインのロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2877,5 +2897,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3084,5 +3104,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "役割"
@@ -3130,73 +3150,71 @@
 msgstr "プロパティ/メンバー"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "変更の適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "新規関連作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "新規関連編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "関連 #{0}の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "基本"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "次によって占められる;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "タグ（空の値でタグ自身を削除）"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "上に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "現在選択したメンバーを一つ上に移動します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "選択したものを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "現在選択されている全てのオブジェクトをメンバーとして追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "選択の削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "現在選択されている全てのオブジェクトを関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "下に移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3205,36 +3223,36 @@
 msgstr "削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "この関連から現在の行のメンバーを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "この関連の全ての未完成のウェイとノードをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "メンバー: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "関連の編集者:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "インポート中に競合を発見しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "サーバからの応答内容が不正です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "サーバに接続できません。"
@@ -3248,10 +3266,11 @@
 msgstr "選択したリレーションを削除"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "リレーション"
@@ -3442,5 +3461,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "地名"
@@ -3487,21 +3506,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "タイプ"
@@ -3554,10 +3573,7 @@
 msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。"
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "マップ"
@@ -3710,4 +3726,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3811,5 +3828,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3861,4 +3878,6 @@
 "the end were omitted or moved to the start."
 msgstr ""
+"トラックの開始以前又は終了以後のタイムスタンプがあるウェイポイントは、開始点"
+"に変更又は移動されました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1024
@@ -3870,19 +3889,34 @@
 "外します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "ダウンロード領域の外"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "バージョン{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0}は次からなります:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0}は削除されました)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "使用法"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "バージョン{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3890,21 +3924,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -3991,4 +4025,6 @@
 "track you were playing (after the first marker)."
 msgstr ""
+"再生ヘッドを、再生しているサウンドトラックに対応するGPXトラックの近くにドラッ"
+"グする必要があります。"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
@@ -4334,5 +4370,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4417,4 +4453,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4498,7 +4536,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4511,7 +4546,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4527,10 +4569,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4699,5 +4741,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4731,7 +4775,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4815,4 +4859,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4865,4 +4917,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4871,7 +4929,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4880,15 +4935,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4913,129 +4957,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "名前"
@@ -5084,12 +5130,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "全てのタイルをロード"
+msgstr "ローカル・ファイル"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zone"
+msgstr "なし"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5116,45 +5160,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "自動車"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "自転車"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5162,25 +5196,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "徒歩"
@@ -5228,7 +5267,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "元gpsポイント間に線を描画"
+msgstr "GPS生データのポイント間にラインを引いて下さい"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5389,5 +5427,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
 msgid "Download List"
-msgstr "ダウンロードリスト"
+msgstr "リストをダウンロードする"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
@@ -5841,10 +5879,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "データを準備中..."
@@ -5854,25 +5892,75 @@
 msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "変更セットを開いています…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "変更した設定を閉じています..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "アップロードする変更はありません。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "準備中..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "アップロード中..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "サーバからの応答内容が不正です。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "不明なホスト"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "正しくないパスワードかユーザ名です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告:パスワードは暗号化されずに送信されます。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "ユーザーとパスワードを保存します(暗号化されません)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "パスワードを入力して下さい"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "ログイン"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5883,44 +5971,52 @@
 msgstr "パース中にエラーが発生しています"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "バージョン番号は不明です"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "バージョン番号は不明です"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "ウエイ以外で<nd>要素が見つかりました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> はゼロ参照です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "<member>要素がリレーション以外に見つかりました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "ref=0の不完全な<member>指定です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "id=0の禁じられたオブジェクトです"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "必要な属性\"{0}\"がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "III-形式のノードID"
@@ -5930,10 +6026,10 @@
 msgstr "サーバに接続中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5943,55 +6039,8 @@
 "試してください。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "アップロードする変更の概略コメントを入力してください。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "コメントを反映します"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} 残っています. アップロード中 {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "エラーが起こりました: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "変更セットを開いています…"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "サーバは変更した設定をサポートしていません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "不明なホスト"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "準備中..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "アップロード中..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "変更した設定を閉じています..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "エラーのため転送が中断しました（５秒待ちます）："
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6161,6 +6210,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "不明な"
@@ -6346,7 +6395,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "エリアの作成"
+msgstr "格子状のウェイの作成"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6358,14 +6406,13 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "共通のノードを持つ2つのウェイを選択してください"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "共通の1つだけのノードで、2つのウェイを選択してください。"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "エリアの作成"
+msgstr "ウェイの格子を作る。"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6389,5 +6436,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "説明"
@@ -6489,5 +6536,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
 msgid "Zoom best fit and 1:1"
-msgstr ""
+msgstr "最適な等倍表示"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
@@ -6528,5 +6575,5 @@
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
-msgstr ""
+msgstr "標準的なディレクトリへのパスを入手できません {0}\n"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
@@ -6543,5 +6590,5 @@
 #, java-format
 msgid "Error while getting files from directory {0}\n"
-msgstr ""
+msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
@@ -6646,4 +6693,6 @@
 msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 msgstr ""
+"<html>私のGPSレシーバーは写真を撮ることができます。<br>これは使えますか。</"
+"html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508
@@ -6669,5 +6718,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
 msgid "Correlate"
-msgstr ""
+msgstr "関連付け"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
@@ -6702,4 +6751,6 @@
 "Expected format: {0}"
 msgstr ""
+"オフセット区切り作業中にエラーです。\n"
+"期待されるフォーマット: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596
@@ -6710,5 +6761,5 @@
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
-msgstr ""
+msgstr "GPX トラック {2} に、{1}中に{0}枚発見しました。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640
@@ -6738,5 +6789,5 @@
 #, java-format
 msgid "Timezone: {0}"
-msgstr ""
+msgstr "タイムゾーン: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760
@@ -6753,15 +6804,15 @@
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
-msgstr ""
+msgstr "{0}／{1} 枚の写真がGPXトラックにマッチしました。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
 #, java-format
 msgid "(Time difference of {0} days)"
-msgstr ""
+msgstr "(時差 {0} 日)"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
-msgstr ""
+msgstr "トラックと写真の間には、時差があります。: {0}分 {1}秒"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
@@ -6775,5 +6826,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
 msgid "Matching photos to track failed"
-msgstr ""
+msgstr "トラックへのフォトマッチに失敗しました。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
@@ -6783,5 +6834,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
 msgid "Default Values"
-msgstr ""
+msgstr "デフォルトの値"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433
@@ -6834,4 +6885,6 @@
 "Please check its availibility on www.cadastre.gouv.fr"
 msgstr ""
+"市/町/村 {0} はWMSに見つからないか、入手不可能です。\n"
+"入手可能かは、www.cadastre.gouv.fr で確認してください。"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283
@@ -6923,5 +6976,5 @@
 "Replace the original white background by the backgound color defined in JOSM "
 "preferences."
-msgstr ""
+msgstr "元の白い背景をJOSMの設定で定義した色の背景に置き換え"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
@@ -6964,5 +7017,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
 msgid "Oldest files are automatically deleted when this size is exceeded"
-msgstr ""
+msgstr "このサイズを超えると古いファイルは自動的に削除されます"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
@@ -7016,5 +7069,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
 msgid "Extract commune boundary"
-msgstr ""
+msgstr "都道府県界、市町村界の抽出"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -7025,5 +7078,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
 msgid "Extract building footprints"
-msgstr ""
+msgstr "建物のフットプリントの抽出"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
@@ -7148,5 +7201,5 @@
 #, java-format
 msgid "Commune bbox: {0}"
-msgstr ""
+msgstr "都道府県 bbox: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283
@@ -7399,4 +7452,7 @@
 "plugin/"
 msgstr ""
+"rxtxSerialライブラリ からロードすることができません。もし、それをインストール"
+"するためのサポートが必要であれば、Globalsat ホームページ（ http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/ ）を試してください。"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
@@ -7641,7 +7697,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "湖沼・海洋"
@@ -7730,4 +7786,6 @@
 "in the range 0-255. Default 90."
 msgstr ""
+"水域として認めるグレーの最大値（Landsat IR-1 データに基づく）。0-255の範囲に"
+"である．デフォルトは90。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
@@ -7748,9 +7806,9 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid "Offset all points in East direction (degrees). Default 0."
-msgstr ""
+msgstr "東方向（°）にすべての点をオフセット。デフォルト 0"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Offset all points in North direction (degrees). Default 0."
-msgstr ""
+msgstr "北方向(度)にあるすべてのポイントのオフセット. デフォルト 0."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
@@ -7760,5 +7818,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
-msgstr ""
+msgstr "水域、海岸線、土地、あるいは なし としてタグ付け。デフォルトは水域。"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
@@ -7934,5 +7992,5 @@
 msgstr "OpenStreetBugs ダウンロード・ループ"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugsに報告された問題点を表示"
@@ -7949,4 +8007,11 @@
 msgstr "警告"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "エラーが起こりました: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7956,4 +8021,6 @@
 msgid "Header contains several values and cannot be mapped to a single string"
 msgstr ""
+"ヘッダが複数の値を含んでいるため、一つのストリングに描画することができませ"
+"ん。"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:95
@@ -7972,35 +8039,38 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "コメントの追加"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "コメントを入力してください"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "完了としてマーク"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "本当に閉じますか？"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "新規問題点"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "問題の作成"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "問題を詳細に記述してください"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "問題の作成"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8029,5 +8099,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8037,9 +8107,9 @@
 "を設定してください。"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "osmarenderオプション"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Firefoxの実行ファイル"
@@ -8111,129 +8181,113 @@
 "た。:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "ナビゲーション"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr "ルーティング"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "何もしない"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "クリックしてルートノードの追加"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "クリックして新規ノードを挿入します。"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "クリックとドラッグでルートノードの移動"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "クリックして新規ノードを挿入します。"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "クリックしてルートノードの追加"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "ルーティングノードのリストを開く"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "重複したノードの削除中…"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "全てのリレーションのリストを開く"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "駅"
+msgid "Add routing layer"
+msgstr "新規レイヤーを作成"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "中級"
+msgstr "基準/条件"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "靴店"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "最短"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "もっと速く"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "最速"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "テラスを反転"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "フェリー航路"
+msgstr "ルートの消去"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "WMSプラグイン設定"
+msgstr "ルーティング プラグインの設定"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "プラグインサイトを設定"
+msgstr "ルーティング設定情報の構成"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "道路の出口"
+msgstr "ハイウェイ タイプ"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "最高速度（km/h）"
+msgstr "速度 (Km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "高さ"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "重みの値の入力"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "スリッピーマップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "タイルの読み込み"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "タイルの状態を表示"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "要求の更新"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "全てのタイルをロード"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "ズームアップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "ズームダウン"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "画像が読み込まれていません。"
@@ -8256,34 +8310,34 @@
 msgstr "スリッピマップ プラグイン用設定"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "タイルソース"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "自動ズーム: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "タイルの自動読み込み "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "最大ズーム lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Fade background: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "メタデータの読み込みエラー"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "要求: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "アップデート要求時にエラー"
@@ -8298,5 +8352,5 @@
 msgstr "１分ごとに取得したデータをファイルに保存します。"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8351,7 +8405,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "州(state)の編集"
+msgstr "タグの編集"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8359,64 +8412,58 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "タグ編集ダイアログの開始"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "JOSM タグ編集プラグイン"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "なし"
+msgstr "(なし)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "ハイライト"
+msgstr "強調"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "多目的"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "{0}このオブジェクトのプロパティーの変更"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "{0}このオブジェクトのプロパティーの変更"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "ルート"
+msgstr "グループ"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "小川"
+msgstr "アイテム"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "検索"
+msgstr "検索: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "ファイル"
+msgstr "フィルタ"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "自動車"
+msgstr "クリア"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8467,5 +8514,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:80
 msgid "Creates individual buildings from a long building."
-msgstr ""
+msgstr "長い建物から個別の建物を生成"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
@@ -8500,5 +8547,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "ストリートの名前"
@@ -8563,5 +8610,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
 msgid "Only up to two areas can be joined at the moment."
-msgstr ""
+msgstr "現在最大2つまでのエリアのみ結合できます。"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
@@ -8593,5 +8640,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "すべての交差点にノードを追加"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
@@ -8600,17 +8647,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "関連"
+msgstr "リレーションの修正"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "オーバーラップ領域を接続する。"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "オーバーラップ領域を接続する。"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8621,12 +8665,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "競合点の統合"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "関連から削除"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8635,17 +8677,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "閉じていないウェイ"
+msgstr "閉じたウェイ"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "レイヤーから写真を削除しますか？"
+msgstr "内部のウェイからタグを削除"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "高速道路のジャンクション"
+msgstr "エリア結合機能"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -8655,5 +8694,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
 msgid "Opens a dialog that allows to jump to a specific location"
-msgstr ""
+msgstr "特定の場所へジャンプできるダイアログを開始"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
@@ -8745,5 +8784,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use the ignore list to suppress warnings."
-msgstr ""
+msgstr "警告を抑制するために、無視するリストを使用する"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:76
@@ -8884,5 +8923,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
 msgid "This test checks that coastlines are correct."
-msgstr ""
+msgstr "このテストは海岸線が正しいことをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:80
@@ -8911,5 +8950,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
 msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
+msgstr "このテストは全く同じ位置にノードがないことをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
@@ -8932,5 +8971,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:22
 msgid "This test finds nodes that have the same name (might be duplicates)."
-msgstr ""
+msgstr "このテストは同じ名前のノードを探します（重複の可能性）。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:42
@@ -8990,5 +9029,5 @@
 msgid ""
 "This test checks for ways with similar names that may have been misspelled."
-msgstr ""
+msgstr "このテストはスペルミスの可能性がある似た名前のウェイをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:141
@@ -8998,5 +9037,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:142
 msgid "This plugin checks for errors in property keys and values."
-msgstr ""
+msgstr "このプラグインはプロパティのキーと値のエラーをチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
@@ -9231,4 +9270,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9310,7 +9355,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "ビル"
@@ -9324,5 +9369,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "領域"
@@ -9342,9 +9387,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
 msgid "Way end node near other highway"
-msgstr ""
+msgstr "ウエイは他の高速道路の近くでノードで終わっています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
 msgid "Way end node near other way"
-msgstr ""
+msgstr "ウェイは他のウェイの近くでノードで終わっています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
@@ -9465,4 +9510,5 @@
 msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
 msgstr ""
+"Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24
@@ -9493,10 +9539,10 @@
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
-msgstr ""
+msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
-msgstr ""
+msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171
@@ -9504,4 +9550,5 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
+"要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232
@@ -9515,5 +9562,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253
 msgid "Reload erroneous tiles"
-msgstr ""
+msgstr "誤ったタイルのリロード"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271
@@ -9527,5 +9574,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:145
 msgid "Open a blank WMS layer to load data from a file"
-msgstr ""
+msgstr "ファイルからデータをロードするためのブランクWMSレイヤを開く"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
@@ -9590,8 +9637,15 @@
 "request a smaller area, or use planet.osm"
 msgstr ""
+"bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求す"
+"るか、planet.osm を使用して下さい。"
 
 #. OSM server message
 #: build/specialmessages.java:9
 msgid "could not get audio input stream from input URL"
+msgstr "入力したURLからは音声入力ストリームを取得できません"
+
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
 msgstr ""
 
@@ -9620,7 +9674,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "エリアの作成"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9630,4 +9683,6 @@
 "openstreetmap.org."
 msgstr ""
+"このプラグインは現在アクティブなJOSMレイヤのGPSトラックをopenstreetmap.orgへ"
+"直接アップロードします。"
 
 #. Plugin Duplicate-Way
@@ -9647,5 +9702,5 @@
 #: build/trans_plugins.java:17
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
-msgstr ""
+msgstr "GlobalSat DG-100データロガーからJOSMに直接GPSポイントをダウンロード"
 
 #. Plugin grid
@@ -9692,5 +9747,5 @@
 #: build/trans_plugins.java:31
 msgid "Displays an OpenLayers background image"
-msgstr ""
+msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
@@ -9711,21 +9766,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "ルーティング能力の提供"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9734,15 +9796,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
-msgstr ""
+msgstr "現在のGPSポジションで、マーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9752,15 +9814,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr "直接JOSMからのTCXファイルをロードしてください。"
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9769,5 +9831,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9776,5 +9838,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9783,5 +9845,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9871,5 +9933,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "道路番号"
@@ -9924,7 +9986,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "レイヤー"
@@ -9967,5 +10029,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -10013,5 +10075,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "一方通行"
@@ -10067,5 +10129,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -10115,5 +10177,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "トンネル"
@@ -10160,5 +10222,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "切り通し"
@@ -10205,5 +10267,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "土手"
@@ -10361,6 +10423,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -10409,5 +10471,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "表面"
@@ -10439,5 +10501,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "舗装"
@@ -10448,5 +10510,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "未舗装"
@@ -10460,5 +10522,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "敷石"
@@ -10505,5 +10567,5 @@
 #: build/trans_presets.java:257
 msgid "driveway"
-msgstr ""
+msgstr "私道"
 
 #: build/trans_presets.java:257
@@ -10610,5 +10672,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10629,6 +10691,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "はい"
@@ -10678,5 +10740,5 @@
 #: build/trans_presets.java:637
 msgid "designated"
-msgstr ""
+msgstr "指定済み"
 
 #. color private
@@ -10752,5 +10814,5 @@
 #: build/trans_presets.java:619
 msgid "agricultural"
-msgstr ""
+msgstr "農業の"
 
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10772,7 +10834,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "いいえ"
@@ -10786,73 +10848,63 @@
 msgstr "大型車"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "馬"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "バイク"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "自動車"
@@ -10927,130 +10979,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "タイプ"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11058,5 +10998,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11064,11 +11004,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11076,5 +11010,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11082,5 +11016,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11088,5 +11022,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11094,6 +11028,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11112,6 +11052,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "高速道路"
@@ -11137,6 +11077,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "国道"
@@ -11162,6 +11102,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "都道府県道"
@@ -11187,6 +11127,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "主要道路"
@@ -11200,5 +11140,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "敷地内道路"
@@ -11216,5 +11156,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "敷地内道路"
@@ -11232,5 +11172,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "サービス"
@@ -11257,6 +11197,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "工事中"
@@ -11297,6 +11237,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11307,5 +11246,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -11396,5 +11335,5 @@
 #: build/trans_presets.java:594 build/trans_presets.java:615
 msgid "gravel"
-msgstr ""
+msgstr "砂利道"
 
 #: build/trans_presets.java:510 build/trans_presets.java:531
@@ -11420,5 +11359,5 @@
 #: build/trans_presets.java:518
 msgid "Track Grade 1"
-msgstr ""
+msgstr "トラック グレード 1"
 
 #. item
@@ -11427,5 +11366,5 @@
 #: build/trans_presets.java:521
 msgid "Edit Track of grade 1"
-msgstr ""
+msgstr "トラック グレード 1　の編集"
 
 #. item "Ways/Track Grade 1" text "Width (meters)"
@@ -11433,5 +11372,5 @@
 #: build/trans_presets.java:539
 msgid "Track Grade 2"
-msgstr ""
+msgstr "トラック グレード 2"
 
 #. item
@@ -11440,5 +11379,5 @@
 #: build/trans_presets.java:542
 msgid "Edit Track of grade 2"
-msgstr ""
+msgstr "トラック グレード 2の編集"
 
 #. item "Ways/Track Grade 2" text "Width (meters)"
@@ -11446,5 +11385,5 @@
 #: build/trans_presets.java:560
 msgid "Track Grade 3"
-msgstr ""
+msgstr "トラック グレード 3"
 
 #. item
@@ -11453,5 +11392,5 @@
 #: build/trans_presets.java:563
 msgid "Edit Track of grade 3"
-msgstr ""
+msgstr "トラック グレード 3　の編集"
 
 #. item "Ways/Track Grade 3" text "Width (meters)"
@@ -11459,5 +11398,5 @@
 #: build/trans_presets.java:581
 msgid "Track Grade 4"
-msgstr ""
+msgstr "トラック グレード 4"
 
 #. item
@@ -11466,5 +11405,5 @@
 #: build/trans_presets.java:584
 msgid "Edit Track of grade 4"
-msgstr ""
+msgstr "トラック グレード 4　の編集"
 
 #. item "Ways/Track Grade 4" text "Width (meters)"
@@ -11472,5 +11411,5 @@
 #: build/trans_presets.java:602
 msgid "Track Grade 5"
-msgstr ""
+msgstr "トラック グレード 5"
 
 #. item
@@ -11479,5 +11418,5 @@
 #: build/trans_presets.java:605
 msgid "Edit Track of grade 5"
-msgstr ""
+msgstr "トラック グレード 5 の編集"
 
 #. item "Ways/Track Grade 5" text "Width (meters)"
@@ -11515,5 +11454,5 @@
 #: build/trans_presets.java:655
 msgid "Edit Hiking"
-msgstr "ハイキング"
+msgstr "ハイキングの編集"
 
 #. item "Ways/Hiking" text "Width (meters)"
@@ -11529,5 +11468,5 @@
 #: build/trans_presets.java:668
 msgid "Edit Mountain Hiking"
-msgstr "山岳ハイキング"
+msgstr "山岳ハイキングの編集"
 
 #. item "Ways/Mountain Hiking" text "Width (meters)"
@@ -11535,5 +11474,5 @@
 #: build/trans_presets.java:677
 msgid "Demanding Mountain Hiking"
-msgstr "Demanding Mountain Hiking"
+msgstr "厳しい山岳ハイキング"
 
 #. item
@@ -11543,5 +11482,5 @@
 #: build/trans_presets.java:681
 msgid "Edit Demanding Mountain Hiking"
-msgstr "Demanding Mountain Hikingの編集"
+msgstr "厳しい山岳ハイキングの編集"
 
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
@@ -11557,5 +11496,5 @@
 #: build/trans_presets.java:694
 msgid "Edit Alpine Hiking"
-msgstr "高山ハイキング"
+msgstr "高山ハイキングの編集"
 
 #. item "Ways/Alpine Hiking" text "Width (meters)"
@@ -11563,5 +11502,5 @@
 #: build/trans_presets.java:703
 msgid "Demanding Alpine Hiking"
-msgstr "Demanding Alpine Hiking"
+msgstr "厳しい高山ハイキング"
 
 #. item
@@ -11571,5 +11510,5 @@
 #: build/trans_presets.java:707
 msgid "Edit Demanding Alpine Hiking"
-msgstr "Demanding Alpine Hikingの編集"
+msgstr "厳しい高山ハイキングの編集"
 
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
@@ -11577,5 +11516,5 @@
 #: build/trans_presets.java:716
 msgid "Difficult Alpine Hiking"
-msgstr "Difficult Alpine Hiking"
+msgstr "困難な高山ハイキング"
 
 #. item
@@ -11585,5 +11524,5 @@
 #: build/trans_presets.java:720
 msgid "Edit Difficult Alpine Hiking"
-msgstr "Difficult Alpine Hikingの編集"
+msgstr "困難な高山ハイキングの編集"
 
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
@@ -11649,14 +11588,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "操作員"
@@ -11681,20 +11620,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "マークだけ"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "信号機"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "途中に島あり"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "マークなし"
@@ -11702,5 +11641,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "馬の背で横断"
@@ -11709,5 +11648,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11717,5 +11656,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "踏切係員"
@@ -11768,5 +11707,5 @@
 #: build/trans_presets.java:767
 msgid "Edit Crossing"
-msgstr ""
+msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
@@ -11830,5 +11769,5 @@
 #: build/trans_presets.java:801
 msgid "Incline"
-msgstr ""
+msgstr "坂"
 
 #. item
@@ -11836,5 +11775,5 @@
 #: build/trans_presets.java:804
 msgid "Incline Steep"
-msgstr ""
+msgstr "急な坂"
 
 #. item
@@ -11864,10 +11803,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "高度"
@@ -11880,29 +11820,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "踏み越し段"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Stileの編集"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "車止め杭"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "bollardの編集"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11911,7 +11840,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11920,240 +11852,225 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "ブロック"
+
+# http://en.wikipedia.org/wiki/Cattle_grid
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Cattle Grid(家畜用格子柵)"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Cattle Gridの編集"
+
+# http://en.wikipedia.org/wiki/Bus_trap
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "バスだけが通行可能になる落とし穴"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "料金所"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "料金所の編集"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "国境検査所"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "国境検査所の編集"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "生け垣"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "フェンス"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "壁"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "城壁"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "擁壁"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "入口"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "入り口の編集"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "ゲート"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "ゲートの編集"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "引き上げゲート"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "引き上げゲートの編集"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Hampshire Gate"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Hampshire Gateの編集"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "竹のゲート"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "竹のゲートの編集"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
-msgstr "Kissing Gateの編集"
+msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Hampshire Gate"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Hampshire Gateの編集"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "車止め杭"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "bollardの編集"
-
-# http://en.wikipedia.org/wiki/Draw_bridge
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "跳ね橋"
-
-# http://en.wikipedia.org/wiki/Draw_bridge
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "跳ね橋の編集"
-
-# http://en.wikipedia.org/wiki/Bus_trap
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "バスだけが通行可能になる落とし穴"
-
-# http://en.wikipedia.org/wiki/Cattle_grid
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Cattle Grid(家畜用格子柵)"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Cattle Gridの編集"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr ""
-
-# http://en.wikipedia.org/wiki/Portcullis
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "城の格子戸"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr ""
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "ゲート"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "門の編集"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr ""
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "踏み越し段"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Stileの編集"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "竹のゲート"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "竹のゲートの編集"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "生け垣"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "フェンス"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "壁"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "料金所"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "料金所の編集"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "国境検査所"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "国境検査所の編集"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "入口"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr ""
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "湖沼・海洋"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "泉"
@@ -12161,5 +12078,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -12167,5 +12084,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "側溝"
@@ -12173,10 +12090,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "小川"
@@ -12184,10 +12101,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "運河"
@@ -12195,10 +12112,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "川"
@@ -12208,5 +12125,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "河川の編集"
@@ -12214,15 +12131,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "湖沼・海洋の編集"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "陸"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "陸の編集"
@@ -12230,5 +12147,5 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -12236,10 +12153,10 @@
 # 水たまりになるような土地
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "ため池"
@@ -12247,15 +12164,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -12263,5 +12180,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "川岸"
@@ -12270,10 +12187,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "湿地帯"
@@ -12284,56 +12201,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "湿地"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "泥地"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "海岸"
@@ -12341,20 +12258,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "海岸の編集"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "湾"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "崖"
@@ -12362,10 +12279,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "海岸線"
@@ -12373,5 +12290,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -12379,5 +12296,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -12385,5 +12302,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -12392,5 +12309,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "ボートヤード"
@@ -12398,10 +12315,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "船着き場の編集"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "ドック"
@@ -12409,5 +12326,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -12415,5 +12332,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "ダム"
@@ -12421,15 +12338,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -12438,5 +12355,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "堰"
@@ -12444,20 +12361,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "滝"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "転回地点"
@@ -12466,15 +12383,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "桟橋"
@@ -12482,10 +12399,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -12493,10 +12410,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "造船台"
@@ -12506,5 +12423,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "造船台の編集"
@@ -12512,10 +12429,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "線路"
@@ -12523,5 +12440,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -12551,8 +12468,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "追加のタイプ"
@@ -12566,35 +12483,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "モノレール"
@@ -12602,45 +12519,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -12648,5 +12565,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -12655,14 +12572,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -12671,5 +12588,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "踏切"
@@ -12678,5 +12595,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -12686,11 +12603,11 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
-msgstr ""
+msgstr "踏切のタイプ"
 
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -12699,10 +12616,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -12710,10 +12627,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -12721,10 +12638,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -12732,24 +12649,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "ゴルフの編集"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "駅"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "駅の編集"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -12759,5 +12689,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
@@ -12773,5 +12703,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12781,5 +12711,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -12787,40 +12717,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
-msgstr ""
+msgstr "収容台数"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "表面"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
-msgstr ""
-
-#: build/trans_presets.java:1370
+msgstr "多階の建物"
+
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "パーク＆ライド"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "料金"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "洗車場"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
@@ -12828,5 +12759,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "自動車パーツショップ"
@@ -12834,15 +12765,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -12850,5 +12781,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "レンタル"
@@ -12857,10 +12788,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -12868,5 +12799,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -12874,5 +12805,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
@@ -12881,5 +12812,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
@@ -12888,15 +12819,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "公共交通機関"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -12904,5 +12835,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "停車場"
@@ -12910,5 +12841,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -12916,5 +12847,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -12923,5 +12854,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -12929,5 +12860,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -12936,5 +12867,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -12946,16 +12877,16 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
-msgstr ""
+msgstr "リファレンス (ホームの番号)"
 
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -12964,10 +12895,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "車いす"
@@ -12976,5 +12907,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -12983,5 +12914,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -12989,5 +12920,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "バス停"
@@ -12997,5 +12928,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -13003,10 +12934,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -13014,5 +12945,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "タクシー"
@@ -13020,5 +12951,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -13026,5 +12957,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "空港"
@@ -13032,15 +12963,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
-msgstr ""
+msgstr "空港の編集"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13049,5 +12980,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -13059,5 +12990,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -13066,15 +12997,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "モーテル"
@@ -13082,20 +13013,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -13103,10 +13034,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "ホステル"
@@ -13114,30 +13045,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -13145,10 +13076,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -13159,5 +13090,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -13165,5 +13096,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -13171,5 +13102,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -13177,61 +13108,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -13239,9 +13170,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "カフェ"
@@ -13249,10 +13180,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -13260,31 +13191,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "パブの編集"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
-msgstr ""
+msgstr "バー"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
-msgstr ""
+msgstr "バーの編集"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -13292,20 +13223,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
@@ -13314,11 +13245,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "営業時間"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "博物館"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "博物館の編集"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "動物園"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "動物園の編集"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "観覧台"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "View pointの編集"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Look-Out Tower"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "テーマパーク"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "テーマパークの編集"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "美術館"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "美術館の編集"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "案内所"
@@ -13326,143 +13318,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "博物館"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "博物館の編集"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "動物園"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "動物園の編集"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "観覧台"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "View pointの編集"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Look-Out Tower"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "テーマパーク"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "テーマパークの編集"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "美術館"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "美術館の編集"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
+msgstr "案内所の編集"
+
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr "マップタイプ"
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr "マップ"
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr "街路地図"
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr "ハイキングマップ"
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr "自転車マップ"
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr "情報板"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr "board"
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr "ヒストリー"
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr "自然"
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr "野生生物"
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr "ガイドポスト(ハイキング)"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr "マップタイプ"
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr "マップ"
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr "街路地図"
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr "ハイキングマップ"
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr "自転車マップ"
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr ""
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr ""
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr "board"
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr "ヒストリー"
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr "自然"
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr "野生生物"
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
-msgstr ""
+msgstr "その他の情報ポイント"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "避難所"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -13470,25 +13402,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "キャンプ場"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "キャンプ場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "城"
@@ -13497,20 +13429,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -13519,20 +13451,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "戦場"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "戦場の編集"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -13540,56 +13484,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "戦場"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "戦場の編集"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1758
+msgstr "道祖神"
+
+#. item
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "親水公園"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "親水公園の編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "遊び場"
@@ -13597,15 +13530,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "つり"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "つりの編集"
@@ -13613,15 +13546,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -13635,6 +13568,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -13713,4 +13646,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14002,28 +13943,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "スポーツ"
@@ -14033,227 +13975,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "ピッチ"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "ピッチの編集"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "多目的"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -14292,191 +14234,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "ピッチ"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "登山"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "サイクリング"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "スケート"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "水泳"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "水泳の編集"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "スキー"
@@ -14484,56 +14426,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "中級"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "上級"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "射撃"
@@ -14541,127 +14485,127 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "フットボール"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "野球"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "ペロタ"
@@ -14669,51 +14613,51 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "テニス"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "ビル"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "ビル"
@@ -14721,5 +14665,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "公共のビル"
@@ -14727,10 +14671,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "公共のビルの編集"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "役場"
@@ -14738,10 +14682,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "大使館"
@@ -14749,10 +14693,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "裁判所"
@@ -14761,10 +14705,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "刑務所"
@@ -14773,10 +14717,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "警察"
@@ -14786,10 +14730,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "消防署"
@@ -14798,10 +14742,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "郵便局"
@@ -14809,5 +14753,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -14815,15 +14759,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "学校"
@@ -14831,10 +14775,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "大学"
@@ -14842,10 +14786,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "短大"
@@ -14853,5 +14797,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "短大の編集"
@@ -14859,5 +14803,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "映画館"
@@ -14866,10 +14810,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "図書館"
@@ -14878,10 +14822,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "図書館の編集"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "美術館"
@@ -14889,10 +14833,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "劇場"
@@ -14901,10 +14845,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -14914,5 +14858,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -14921,6 +14865,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "地域"
@@ -14929,66 +14873,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "宗派"
@@ -14997,81 +14942,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "住所"
@@ -15080,5 +15025,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -15086,5 +15031,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "いえ番号"
@@ -15092,20 +15037,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "都市名"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "国コード"
@@ -15113,5 +15058,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "住所の補間"
@@ -15120,5 +15065,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -15126,67 +15071,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "全て"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "アスレチック"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "工場"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "タワー"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "灯台"
@@ -15194,10 +15144,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "風車"
@@ -15205,10 +15155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -15216,10 +15166,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -15229,10 +15179,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "クレーン"
@@ -15240,10 +15190,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "ビーコン"
@@ -15251,10 +15201,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -15262,10 +15212,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -15273,5 +15223,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
@@ -15279,5 +15229,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "発電機"
@@ -15287,39 +15237,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
-msgstr ""
-
-#: build/trans_presets.java:2263
+msgstr "水力発電"
+
+#: build/trans_presets.java:2260
 msgid "fossil"
-msgstr ""
-
-#: build/trans_presets.java:2263
+msgstr "火力発電"
+
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
-msgstr ""
-
-#: build/trans_presets.java:2263
+msgstr "太陽光発電"
+
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "ガス"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "変電所"
@@ -15328,10 +15278,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -15340,5 +15290,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -15346,10 +15296,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "送電塔"
@@ -15360,5 +15310,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
@@ -15366,5 +15316,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "送電線"
@@ -15373,25 +15323,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "電圧"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "ワイヤー量"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "トイレ"
@@ -15399,25 +15349,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "参照番号"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "料金"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "電話"
@@ -15426,5 +15371,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -15432,5 +15377,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "コイン"
@@ -15438,5 +15383,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "備考"
@@ -15444,5 +15389,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -15450,5 +15395,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -15456,15 +15401,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "リサイクル"
@@ -15473,5 +15418,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -15479,35 +15424,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "ベンチ"
@@ -15516,20 +15461,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "隠す"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "ロック"
@@ -15537,22 +15482,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "噴水"
@@ -15561,10 +15506,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -15573,10 +15518,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -15584,25 +15529,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -15610,10 +15555,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "キオスク"
@@ -15621,10 +15566,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -15632,5 +15577,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -15638,88 +15583,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "精肉店"
@@ -15727,10 +15672,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "パン屋"
@@ -15738,10 +15683,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "生花店"
@@ -15749,70 +15694,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "学校"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "靴店の編集"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "飲料店の編集"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "家電店"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "家具店"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -15820,10 +15779,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "金物屋"
@@ -15831,10 +15790,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -15842,60 +15801,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "文具店"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "靴店"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "ビデオ"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -15903,10 +15862,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "ランドリー"
@@ -15914,10 +15873,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -15925,35 +15884,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "スポーツ店"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "スポーツ"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "眼鏡屋"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "銀行"
@@ -15961,5 +15922,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "銀行の編集"
@@ -15967,10 +15928,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "両替"
@@ -15978,5 +15939,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -15984,15 +15945,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "医院"
@@ -16000,20 +15961,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "薬局"
@@ -16021,5 +15982,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -16027,10 +15988,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "調剤薬局"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "病院"
@@ -16038,10 +15999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -16050,5 +16011,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -16057,20 +16018,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
-msgstr ""
+msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -16078,5 +16039,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "動物病院"
@@ -16085,25 +16046,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "大陸"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "国(country)"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "国(country)の編集"
@@ -16111,45 +16072,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "州(state)"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "地方"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "郡"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "郡の編集"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "市区"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "町"
@@ -16157,10 +16119,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -16168,30 +16130,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "村"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "地域"
@@ -16199,10 +16162,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "島"
@@ -16210,5 +16173,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "島の編集"
@@ -16216,5 +16179,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -16222,10 +16185,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "山頂"
@@ -16233,10 +16196,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "氷河"
@@ -16244,10 +16207,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "火山"
@@ -16255,70 +16218,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "国境"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr "地点名"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr "国立公園"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "樹木・林"
@@ -16327,15 +16290,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "森"
@@ -16344,5 +16307,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -16350,17 +16313,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "森"
@@ -16369,19 +16332,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "ガレ場"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "ガレ場の編集"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "低木林"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "低木林の編集"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "山(Fell)"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "山(Fell)の編集"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "荒れ地"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "荒れ地の編集"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -16390,70 +16397,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "農地"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "庭園"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "草地"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "里山"
@@ -16461,5 +16469,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
@@ -16468,5 +16476,5 @@
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "共有地"
@@ -16474,20 +16482,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "公園"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -16495,5 +16503,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -16501,15 +16509,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "墓所"
@@ -16517,9 +16525,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -16527,39 +16535,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "商用"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "工業"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -16567,114 +16575,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "軍用"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "軍用地の編集"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "工事中エリア"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "工事中用地の編集"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "工事中エリア"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "工事中用地の編集"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "採石場"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "軍用"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "軍用地の編集"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "ガレ場"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "ガレ場の編集"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "低木林"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "低木林の編集"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "山(Fell)"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "山(Fell)の編集"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "荒れ地"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "荒れ地の編集"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -16684,5 +16649,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -16691,10 +16656,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -16702,5 +16667,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -16709,5 +16674,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -16715,34 +16680,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -16751,15 +16716,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "ウエイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "ウエイへ"
@@ -16767,5 +16732,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "ルート"
@@ -16774,5 +16739,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -16780,5 +16745,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "ルート種類"
@@ -16850,24 +16815,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "自転車"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "スキー"
@@ -16912,4 +16877,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16919,21 +16887,22 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "徒歩"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
-msgstr ""
+msgstr "迂回路"
 
 #. color otherrail
@@ -16945,10 +16914,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -16956,26 +16925,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
-msgstr ""
-
-#: build/trans_presets.java:2989
+msgstr "案"
+
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -16984,30 +16953,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
-msgstr ""
+msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
-msgstr ""
+msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17191,4 +17160,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17200,4 +17276,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17299,11 +17384,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "破棄された"
@@ -17345,7 +17432,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "馬"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "ゲート等"
 
 #. color tertiary
@@ -17381,6 +17683,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "ストリート"
@@ -17436,7 +17738,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "車線"
@@ -17483,108 +17785,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "線路"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "高架橋"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17601,4 +17816,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "サービス"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17608,4 +17829,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "浅瀬（洗い越し）"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17622,8 +17849,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "転回所"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "夜間急病センター"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17635,5 +17876,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "川岸"
@@ -17647,5 +17888,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "小川"
@@ -17659,5 +17900,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "ドック"
@@ -17685,5 +17926,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "水道"
@@ -17698,4 +17939,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17735,5 +17977,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17850,12 +18092,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "人工物"
@@ -17901,5 +18144,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17917,7 +18160,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17940,10 +18183,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
-msgstr ""
+msgstr "その他の軌道"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17973,8 +18216,8 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
-msgstr ""
+msgstr "古い軌道"
 
 #. color rail
@@ -18017,6 +18260,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "空路"
@@ -18030,5 +18273,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "駅"
@@ -18050,5 +18293,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "空路（暗色）"
@@ -18062,5 +18305,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "空路（明色）"
@@ -18083,4 +18326,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18100,4 +18351,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "リフト"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18106,23 +18363,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "リフト"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "初球者スキーコース"
@@ -18136,5 +18380,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "中級者スキーコース"
@@ -18148,5 +18393,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "上級者スキーコース"
@@ -18159,6 +18405,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "フリースタイルのゲレンデ"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "フリースタイルのゲレンデ"
@@ -18172,5 +18433,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "初心者スキーゲレンデ"
@@ -18201,4 +18463,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18233,4 +18503,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18243,8 +18537,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "電力"
@@ -18257,5 +18553,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "桟橋"
@@ -18269,5 +18568,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "パイプライン"
@@ -18395,12 +18694,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "レジャー"
@@ -18414,5 +18713,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "マリーナ"
@@ -18484,10 +18783,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
-msgstr ""
+msgstr "アメニティ"
 
 #. color amenity
@@ -18521,4 +18820,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18578,11 +18885,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "アメニティ_交通"
@@ -18721,6 +19028,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18947,22 +19275,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "アメニティ_信号"
@@ -18994,6 +19322,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "信号_水域"
@@ -19029,4 +19357,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19046,7 +19382,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "健康"
@@ -19140,4 +19477,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19340,4 +19685,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19371,28 +19732,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "店"
@@ -19446,4 +19809,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19456,8 +19827,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "ホテル"
@@ -19512,4 +19883,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19606,9 +19978,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "旅行関係"
@@ -19680,8 +20052,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "史跡"
@@ -19751,9 +20123,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "緑"
@@ -19767,5 +20139,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "石切り場"
@@ -19779,5 +20151,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "埋め立て地"
@@ -19799,5 +20171,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -19811,5 +20183,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "森"
@@ -19823,5 +20195,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "農地"
@@ -19844,5 +20216,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "小売りの商用地"
@@ -19856,5 +20228,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "工業地"
@@ -19868,5 +20240,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -19880,5 +20252,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "緑地"
@@ -19892,7 +20264,7 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
-msgstr ""
+msgstr "鉄道公園"
 
 #. color construction
@@ -19947,7 +20319,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "軍用地"
@@ -19961,5 +20333,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "墓地"
@@ -19972,5 +20344,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "頂上"
@@ -19985,5 +20357,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "氷河"
@@ -19997,5 +20369,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "火山"
@@ -20010,4 +20382,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20049,7 +20422,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "自然"
@@ -20063,5 +20437,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "低木"
@@ -20075,5 +20449,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "荒地"
@@ -20087,5 +20461,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "森"
@@ -20099,5 +20473,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "泥"
@@ -20111,5 +20485,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "ビーチ"
@@ -20187,8 +20561,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "ルート"
@@ -20236,7 +20610,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "行政区画"
@@ -20378,10 +20752,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "場所"
@@ -20422,6 +20796,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "住所"
@@ -20561,5 +20942,5 @@
 #: build/trans_validator.java:44
 msgid "wrong highway tag on a node"
-msgstr ""
+msgstr "ノード上の誤った高速道路タグ"
 
 #. node : W : highway == track
@@ -20703,135 +21084,54 @@
 msgstr "Streets NRW Geofabrik.de"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "これを選択すると、gpsデバイスが線を引かない場合、ウェイに沿って線を描画す"
-#~ "る。"
-
-#~ msgid "Reset Graph"
-#~ msgstr "グラフリセット"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "競合リストからどれか選択してください。"
-
-#~ msgid "Please select a color."
-#~ msgstr "色を選択してください"
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "フルスクリーン・モードで起動しない"
-
-#~ msgid "News about JOSM"
-#~ msgstr "JOSMに関するニュース"
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "クリックして既存のノードとつなぎます。"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "このトレースのアップロード…"
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>この機能は最近追加されたばかりです。<br>注意して利用し、期待したよう"
-#~ "に動いているか確認してください</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "JOSMによってフィルターされたトラックをアップロード"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "生ファイルのアップロード: "
-
-#~ msgid "Description:"
-#~ msgstr "記述:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "タグ（GPX中のキーワード）:"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "GPX-アップロード"
-
-#~ msgid "time"
-#~ msgstr "時刻"
-
-#~ msgid "desc"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "開く..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
 #~ msgstr "説明"
 
-#~ msgid "symbol"
-#~ msgstr "シンボル"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "生ファイル {0}のアップロード"
-
-#~ msgid "Tags:"
-#~ msgstr "タグ:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "地点の速度によって、軌跡の色彩を変える配色を行う。"
-
-#~ msgid "Edit an Exit"
-#~ msgstr "出口の編集"
-
-#~ msgid "Exit Number"
-#~ msgstr "出口番号"
-
-#~ msgid "Exit Name"
-#~ msgstr "出口の名前"
-
-#~ msgid "Information point"
-#~ msgstr "観光案内所"
-
-#~ msgid "political"
-#~ msgstr "political境界"
-
-#~ msgid "National_park"
-#~ msgstr "国立公園の境界"
-
-#~ msgid "Add Site"
-#~ msgstr "サイトの追加"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "サイトの削除"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "削除するサイトを選択してください。"
-
-#~ msgid "Check Site(s)"
-#~ msgstr "サイトのチェック"
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "新しいプラグインサイトを追加。"
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "一覧から選択したサイトを削除する。"
-
-#~ msgid "Update Sites"
-#~ msgstr "サイトのアップデート"
-
-#~ msgid "Version"
-#~ msgstr "バージョン"
-
-#~ msgid "Install"
-#~ msgstr "インストール"
-
-#~ msgid "Signpost"
-#~ msgstr "道路案内標識"
-
-#~ msgid "office"
-#~ msgstr "オフィス"
-
-#~ msgid "guidepost"
-#~ msgstr "道しるべ"
-
-#~ msgid "Update Site URL"
-#~ msgstr "サイトのURLをアップデート"
-
-#~ msgid "Invalid URL"
-#~ msgstr "不正なURL"
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "\"{0}\"ウェイは少なくとも2ノードからなる必要があります。"
-
-#~ msgid "Upload GPX track"
-#~ msgstr "gpsトラックのアップロード"
+#~ msgid "Commit comment"
+#~ msgstr "コメントを反映します"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "サーバは変更した設定をサポートしていません"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "エラーのため転送が中断しました（５秒待ちます）："
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？"
+
+#~ msgid "Navigation"
+#~ msgstr "ナビゲーション"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "ルートノードの削除"
+
+#~ msgid "Start routing"
+#~ msgstr "ルーティングの開始"
+
+# http://en.wikipedia.org/wiki/Draw_bridge
+#~ msgid "Drawbridge"
+#~ msgstr "跳ね橋"
+
+# http://en.wikipedia.org/wiki/Draw_bridge
+#~ msgid "Edit Drawbridge"
+#~ msgstr "跳ね橋の編集"
+
+# http://en.wikipedia.org/wiki/Portcullis
+#~ msgid "Portcullis"
+#~ msgstr "城の格子戸"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "城の格子戸の編集"
+
+#~ msgid "Charge"
+#~ msgstr "料金"
+
+#~ msgid "sports"
+#~ msgstr "スポーツ店"
+
+#~ msgid "viaduct"
+#~ msgstr "高架橋"
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/nl.po	(revision 14844)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-24 16:48+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-24 18:35+0000\n"
+"Last-Translator: Willem1 <willem.sonke@planet.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:52+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Hoofd-GUI aanmaken"
@@ -30,5 +30,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:296
 msgid "Help"
-msgstr "Hulp"
+msgstr "Help"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:258
@@ -36,5 +36,5 @@
 msgstr "De projectie staat niet in de voorkeuren. EPSG:4326 wordt gebruikt."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -42,35 +42,35 @@
 "naar de server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Niet-opgeslagen wijzigingen"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr ""
 "Wijzigingen zijn niet opgeslagen. Deze veranderingen negeren en verder gaan?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Sla op en verlaat JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Negeer veranderingen en verlaat JOSM"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -81,10 +81,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -95,4 +95,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -102,10 +103,10 @@
 msgstr "Annuleren"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ongeldige URL negeren: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -131,8 +132,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -150,5 +151,5 @@
 #, java-format
 msgid "Last change at {0}"
-msgstr "Laatst verandering op {0}"
+msgstr "Laatste verandering op {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:138
@@ -273,5 +274,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -409,6 +410,6 @@
 msgstr "Omkeren en combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -416,20 +417,20 @@
 msgstr "Waarden voor alle conflicten invoeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Conflicten oplossen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} wegen combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Alle wegen zijn leeg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -531,5 +532,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -650,6 +651,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -658,6 +659,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -784,5 +785,5 @@
 msgstr "Toch samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -790,5 +791,5 @@
 "in gebruik is."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1063,5 +1064,5 @@
 msgstr "Huidige gegevens opslaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1071,26 +1072,26 @@
 "dit als fout a.u.b."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Geen document geopend, dus ook niets om op te slaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Leeg document"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Het document bevat geen gegevens."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Toch opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Conflicten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1100,32 +1101,32 @@
 "niet opgeslagen en worden behandeld alsof je ze genegeerd hebt. Doorgaan?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Conflicten verwerpen en opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "GPX-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "OSM-bestand opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Kan van bestand geen backup maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Onbekende bestandsextentie."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Het opslaan is mislukt."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Het herstellen van backupbestand is mislukt."
@@ -1182,18 +1183,18 @@
 msgstr "Sluiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Weg splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Een weg bij de geselecteerde knoop splitsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "De huidige selectie kan niet gebruik worden voor splitsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1201,5 +1202,5 @@
 msgstr[1] "De geselecteerde knopen liggen niet in het midden van enige weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1215,9 +1216,9 @@
 "heeft, Selecteer ook de weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "De geselecteerde knopen hebben niet dezelfde weg gemeen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1225,11 +1226,11 @@
 msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Je moet twee of meer knopen selecteren om een rondgaande weg te splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1239,5 +1240,5 @@
 "selecteer knopen in het midden van de weg.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1248,5 +1249,5 @@
 "Je moet dit controleren en waar nodig corrigeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1406,46 +1407,50 @@
 "Deze opdracht zal {0} individuele downloadverzoeken vereisen. Toch doorgaan?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Naar OSM uploaden..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Upload alle aanpassingen naar de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Objecten om toe te voegen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Objecten om te bewerken:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Objecten om aan te verwijderen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Beschrijf kort de veranderingen die je upload:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Deze veranderingen uploaden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Aanpassingen uploaden"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Niets om te uploaden. Creëer eerst gegevens."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Er zijn nog onopgeloste conflicten, deze dien je eerst op te lossen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Geen aanpassingen aanwezig om te uploaden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Gegevens uploaden"
@@ -1630,31 +1635,33 @@
 msgstr "Kan geen knoop buiten de wereld toevoegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Knoop toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Knoop in weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Bestaande weg aan knoop koppelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Een nieuwe knoop aan een bestaande weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Knoop in weg voegen en verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Nieuwe node maken."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Selecteer de node onder de cursor."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1663,9 +1670,4 @@
 msgstr[0] "Nieuwe node toevoegen aan weg."
 msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Selecteer de node onder de cursor."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2089,5 +2091,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2283,5 +2285,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "spoorweg"
@@ -2303,127 +2305,127 @@
 msgstr[1] "{0} knopen"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Oppervlak van weg is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygone weg \"{0}\" is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Relatie bevat leeg lid."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Lid \"{0}\" in relatie wissen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg \"{0}\" met minder dan twee punten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Meer dan een \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Meer dan een \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "Meer dan éé \"via\" gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Onbekende rol \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Onbekend lidtype voor \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Geen \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Geen \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "Geen \"via\"-knoop of -weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stijl voor beperking {0} is niet gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Niet-weg \"{0}\" in multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Geen buitenweg voor multipolygoon \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Binnenweg \"{0}\" is uitwendig."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "niet-getagd"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "tekst"
@@ -2431,5 +2433,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2457,5 +2459,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "achtergrond"
@@ -2523,5 +2525,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2535,5 +2537,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2563,14 +2565,14 @@
 msgstr "samengevoegde versie:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Melding van de dag niet beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "\"Dagmelding\" downloaden"
@@ -2644,71 +2646,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Gebruikersnaam"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Kan geen vertaling voor taalgebied {0} vinden. Naar {1} terugvallen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "gebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "opties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Deze hulptekst tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Standaard UNIX-geometrieargument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Het omgrensde gebied downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Open bestand (als rawe GPS, indien .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Het omgrensde gebied downloaden als rawe GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Met de opgegeven zoekactie selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "De voorkeuren herstellen op standaardwaarden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "De taal instellen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "voorbeelden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2718,23 +2720,28 @@
 "zorg dat je wat gegevens laadt voor --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "In plaats van --download=<bbox> kun je ook osm://<bbox> opgegeven\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Bijgewerkte plugins activeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Vroege plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Standaarden instellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Plugins laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2915,5 +2922,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3128,5 +3135,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Rol"
@@ -3174,73 +3181,71 @@
 msgstr "Eigenschappen / Leden"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Wijzigingen toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Nieuwe relatie aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Nieuw relatie bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Relatie #{0} bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Basis"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Bezet door"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Tags (lege waarde verwijdert de tag)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Omhoog bewegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "De geselecteerde leden omhoog verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Selectie toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Alle geselecteerde objecten als leden toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Geselecteerde verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Alle nu geselecteerde objecten uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Omlaag bewegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "De geselecteerde leden omlaag verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3249,36 +3254,36 @@
 msgstr "Verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Leden downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Leden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relatie-editor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Er zijn conflicten tijdens het importeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Ontleden van de serverreactie is mislukt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Kan niet met server verbinden."
@@ -3292,10 +3297,11 @@
 msgstr "De geselecteerde relatie verwijderen"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relaties"
@@ -3490,5 +3496,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Locaties"
@@ -3535,21 +3541,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "soort"
@@ -3602,10 +3608,7 @@
 msgstr "Je kunt met de muis of CTRL+pijltoetsen zoomen en verplaatsen."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Kaart"
@@ -3759,4 +3762,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3862,5 +3866,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3923,19 +3927,34 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "buiten gedownload gebied"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Versie {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} bestaat uit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} verwijderd.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "gebruik"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Versie {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3943,21 +3962,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4400,5 +4419,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4483,4 +4502,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4564,7 +4585,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4577,7 +4595,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4593,10 +4618,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4765,5 +4790,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4797,7 +4824,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4881,4 +4908,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4931,4 +4966,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4937,7 +4978,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4946,15 +4984,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4979,129 +5006,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Naam"
@@ -5150,12 +5179,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Alle tegels laden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zone"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5182,45 +5209,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Auto"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Fiets"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5228,25 +5245,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Te voet"
@@ -5294,7 +5316,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Teken lijnen tussen rauwe GPS punten."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5942,10 +5963,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointer-uitzondering, mogelijk ontbreken er tags."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Gegevens voorbereiden..."
@@ -5955,25 +5976,75 @@
 msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Changeset openen"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Changeset sluiten"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Geen aanpassingen aanwezig om te uploaden."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Voorbereiden…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Uploaden..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Ontleden van de serverreactie is mislukt."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Onbekende host"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Verkeerd wachtwoord of gebruikersnaam."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Waarschuwing: het wachtwoord wordt onversleuteld verstuurd."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Gebruikersnaam en wachtwoord opslaan (onversleuteld)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Voer wachtwoord in"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5984,44 +6055,52 @@
 msgstr "Fout tijdens ontleden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Onbekende versie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Onbekende versie"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "<nd>-element in niet-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> heeft geen referenties"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "<member>-element in niet-relatie gevonden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member>-specificatie met ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Ongeldig object met id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Verplicht attribuut \"{0}\" ontbreekt."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Een weg overslaan omdat het een niet bestaande knoop bevat: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "OSM-gegevens voorbereiden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Misvormde knoop-id"
@@ -6031,5 +6110,5 @@
 msgstr "Met server verbinden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -6037,5 +6116,5 @@
 "Kan niet met de OSM-server verbinden. Controleer je internetverbinding."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6045,55 +6124,8 @@
 "nog eens."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Beschrijf kort de veranderingen die je upload:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Opmerking bevestigen"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} te gaan. Uploading {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Een fout is opgetreden: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Changeset openen"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Server ondersteunt geen changesets"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Onbekende host"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Voorbereiden…"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Uploaden..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Changeset sluiten"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6266,6 +6298,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "onbekend"
@@ -6452,7 +6484,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Gebieden aanmaken"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6471,7 +6502,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Gebieden aanmaken"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6495,5 +6525,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Beschrijving"
@@ -7777,7 +7807,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "water"
@@ -8081,5 +8111,5 @@
 msgstr "Downloadlus van OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreetBugs-onderwerpen tonen"
@@ -8099,4 +8129,11 @@
 msgstr "Waarschuwing"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Een fout is opgetreden: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8125,35 +8162,38 @@
 "te downloaden"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Opmerkingen toevoegen"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Voer je opmerking in"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Als uitgevoerd markeren"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Zeker sluiten?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Nieuw onderwerp"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Onderwerp aanmaken"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Geef een nauwkeurige probleemomschrijving"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Onderwerp aanmaken"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8182,5 +8222,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8190,9 +8230,9 @@
 "kaartinstellingenpagina van Voorkeuren."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "osmarender-optie"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Firefox-executable"
@@ -8264,95 +8304,77 @@
 "Afstandsbediening is gevraagd gegevens te importeren van de volgende URL:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Navigatie"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Niets"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "bestemming"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Klik om een nieuwe knoop in te voegen."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-#, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Klik om een nieuwe knoop in te voegen."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Dubbele knopen verwijderen..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Een lijst met alle relaties openen."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Station"
+msgid "Add routing layer"
+msgstr "Voegt nieuwe laag toe"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "middelzwaar"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Schoenen"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Sneller"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Het terras omkeren"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Veerpontroute"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Voorkeuren WMS-plugin"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Plugin-site configureren"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Snelwegafrit"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Max. snelheid (km/u)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Hoogte"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8360,33 +8382,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Slippy-kaart"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Tegel laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Tegelstatus tonen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Update aanvragen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Alle tegels laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Zoom vergroten"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Zoom verkleinen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "afbeelding is niet geladen"
@@ -8409,34 +8431,34 @@
 msgstr "Instellingen voor de Slippy-kaartplugin"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Tegelbronnen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Auto-zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Auto-laden tegels: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Max. zoom |v|: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Achtergrond vervagen: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "laden van metadata is mislukt"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "verzocht: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "update aanvragen is mislukt"
@@ -8451,5 +8473,5 @@
 msgstr "Verkregen gegevens iedere minuut naar bestand schrijven."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8504,7 +8526,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Provincie bewerken"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8519,59 +8540,51 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "geen"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "markeren"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "Meervoudig"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Eigenschappen van {0} object aanpassen"
-msgstr[1] "Eigenschappen van {0} objecten aanpassen"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Eigenschappen van {0} object aanpassen"
-msgstr[1] "Eigenschappen van {0} objecten aanpassen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "route"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Stroom"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Zoeken"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Bestand"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Auto"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8655,5 +8668,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Straatnaam"
@@ -8759,17 +8772,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relatie"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Overlappende gebieden samenvoegen"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Overlappende gebieden samenvoegen"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8782,12 +8792,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Samenvoegconflicten."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Uit relatie verwijderen"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8796,17 +8804,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Niet-gesloten wegen."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Foto uit laag verwijderen"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Snelwegkruising"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9413,4 +9418,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9492,7 +9503,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "gebouw"
@@ -9506,5 +9517,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "gebied"
@@ -9814,4 +9825,9 @@
 msgstr "Kan geen geluidsinvoerstroom uit invoer-URL krijgen"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9838,7 +9854,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Gebieden aanmaken"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9929,21 +9944,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9952,15 +9974,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9970,15 +9992,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9987,5 +10009,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9994,5 +10016,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -10001,5 +10023,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10089,5 +10111,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Referentie"
@@ -10142,7 +10164,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "laag"
@@ -10185,5 +10207,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Max. snelheid (km/u)"
@@ -10231,5 +10253,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Éénrichtingsweg"
@@ -10285,5 +10307,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brug"
@@ -10333,5 +10355,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -10378,5 +10400,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Verdieping"
@@ -10423,5 +10445,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Verhoging"
@@ -10579,6 +10601,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Breedte (meters)"
@@ -10627,5 +10649,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Oppervlakte"
@@ -10657,5 +10679,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "verhard"
@@ -10666,5 +10688,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "onverhard"
@@ -10678,5 +10700,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "kinderhoofdjes"
@@ -10828,5 +10850,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10847,6 +10869,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "ja"
@@ -10990,7 +11012,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "nee"
@@ -11004,73 +11026,63 @@
 msgstr "Zwaar vrachtverkeer"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Ruiters"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motorfiets"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Gemotoriseerd verkeer"
@@ -11145,130 +11157,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Soort"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11276,5 +11176,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11282,11 +11182,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11294,5 +11188,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11300,5 +11194,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11306,5 +11200,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11312,6 +11206,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11330,6 +11230,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "Autosnelweg"
@@ -11355,6 +11255,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "autoweg"
@@ -11380,6 +11280,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "provinciale weg"
@@ -11405,6 +11305,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "N-weg"
@@ -11418,5 +11318,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "weg buiten bebouwde kom"
@@ -11434,5 +11334,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "woongebied"
@@ -11450,5 +11350,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "toegangsweg"
@@ -11475,6 +11375,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "werkzaamheden"
@@ -11515,6 +11415,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11525,5 +11424,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "rotonde"
@@ -11867,14 +11766,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Bedrijf"
@@ -11899,20 +11798,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "zonder verkeerslichten"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "verkeerslichten"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "eiland"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "ongemarkeerd"
@@ -11920,5 +11819,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "Als ruiter oversteken"
@@ -11927,5 +11826,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "Op de fiets oversteken"
@@ -11935,5 +11834,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "Klaar-over"
@@ -12082,10 +11981,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Stijging"
@@ -12098,29 +11998,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Overstap"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Overstap bewerken"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Verkeerspaal"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Verkeerspaal bewerken"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12129,7 +12018,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12138,235 +12030,223 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Toegestaan verkeer:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Blok"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Wildrooster"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Wildrooster bewerken"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "Bussluis"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr "Pennen"
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr "Spijkers bewerken"
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Tolpoort"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Tolpoort bewerken"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Grenspost"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Grenspost bewerken"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Haag"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Hek"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Muur"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Stadsmuur"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Stutmuur"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Ingang"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Ingang bewerken"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "Poort"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "Poort bewerken"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "Slagboom"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "Slagboom bewerken"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Draadhek"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Draadhek bewerken"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Botspoort"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Botspoort bewerken"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "Sluipdoorhek"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
 msgstr "Sluipdoorhek bewerken"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Draadhek"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Draadhek bewerken"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Verkeerspaal"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Verkeerspaal bewerken"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Kabelbrug"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Kabelbrug bewerken"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "Bussluis"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Wildrooster"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Wildrooster bewerken"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr "Pennen"
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr "Spijkers bewerken"
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Valhek"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Valhek bewerken"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "Poort"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "Poort bewerken"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr "Slagboom"
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr "Slagboom bewerken"
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Overstap"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Overstap bewerken"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Gekoppelde deuren"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Gekoppelde deuren bewerken"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Botspoort"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Botspoort bewerken"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Haag"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Hek"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Blok"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Muur"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Stadsmuur"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Stutmuur"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Tolpoort"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Tolpoort bewerken"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Grenspost"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Grenspost bewerken"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Ingang"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Ingang bewerken"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Water"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Bron"
@@ -12374,5 +12254,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Bron bewerken"
@@ -12380,5 +12260,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Sloot"
@@ -12386,10 +12266,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Sloot bewerken"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Stroom"
@@ -12397,10 +12277,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Stroom bewerken"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Kanaal"
@@ -12408,10 +12288,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Kanaal bewerken"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Rivier"
@@ -12421,5 +12301,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Rivier bewerken"
@@ -12427,15 +12307,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Water bewerken"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Land bewerken"
@@ -12443,15 +12323,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Estuarium"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Estuarium bewerken"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -12459,15 +12339,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Reservoir bewerken"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Ondergronds reservoir"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Ondergronds reservoir bewerken"
@@ -12475,5 +12355,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Rivierbank"
@@ -12482,10 +12362,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Rivierbank bewerken"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Drasland"
@@ -12496,56 +12376,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Drasland bewerken"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "Moeras"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "veen"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "moeras"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "rietveld"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "Zoutwatermoeras"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "slik"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "mangroven"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Modder"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Modder bewerken"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Strand"
@@ -12553,20 +12433,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Strand bewerken"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Baai"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Baai bewerken"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Klif"
@@ -12574,10 +12454,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Klif bewerken"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Kustlijn"
@@ -12585,5 +12465,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Kustlijn bewerken"
@@ -12591,5 +12471,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Veerpontroute"
@@ -12597,5 +12477,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Veerpontroute bewerken"
@@ -12604,5 +12484,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Scheepswerf"
@@ -12610,10 +12490,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Scheepswerf bewerken"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Dok"
@@ -12621,5 +12501,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Dok bewerken"
@@ -12627,5 +12507,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Dam"
@@ -12633,15 +12513,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Dam bewerken"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Waterwegpunt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Sluis"
@@ -12650,5 +12530,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Stuw"
@@ -12656,20 +12536,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Stuw bewerken"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Waterval"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Waterval bewerken"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Zwaaiplaats"
@@ -12678,15 +12558,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Jachthaven"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Jachthaven bewerken"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Pier"
@@ -12694,10 +12574,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Pier bewerken"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Veerbootterminal"
@@ -12705,10 +12585,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Veerbootterminal bewerken"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Trailerhelling"
@@ -12718,5 +12598,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Trailerhelling bewerken"
@@ -12724,10 +12604,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Spoorweg"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Spoor"
@@ -12735,5 +12615,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Spoor bewerken"
@@ -12763,8 +12643,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Optionele soorten"
@@ -12778,35 +12658,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "tuin"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "nevenweg"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "privéoprit"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Smalspoor"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Smalspoor bewerken"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Monorail"
@@ -12814,45 +12694,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Monorail bewerken"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Museumspoor"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Een museumspoorweg bewerken"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Sneltram"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Sneltram bewerken"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Metro bewerken"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Tram"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Tram bewerken"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Busbaan"
@@ -12860,5 +12740,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Busbaan bewerken"
@@ -12867,14 +12747,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Ongebruikt spoor"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Ongebruikt spoor bewerken"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Verwijderd spoor"
@@ -12883,5 +12763,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Bewaakte spoorwegovergang"
@@ -12890,5 +12770,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Onbewaakte spporwegovergang"
@@ -12898,5 +12778,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12904,5 +12784,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Draaiplateau"
@@ -12911,10 +12791,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Kabelbaan"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Stoeltjeslift"
@@ -12922,10 +12802,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Stoeltjeslift bewerken"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Sleeplift"
@@ -12933,10 +12813,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Sleeplift bewerken"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Kabinebaan"
@@ -12944,24 +12824,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Kabinebaan bewerken"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Golf bewerken"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Station"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Station bewerken"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Brandstof"
@@ -12971,5 +12864,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Brandstof bewerken"
@@ -12985,5 +12878,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12993,5 +12886,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Parkeerplaats bewerken"
@@ -12999,40 +12892,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Capaciteit"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "oppervlak"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "meerlaags"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "ondergronds"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "Parkeer en Reis"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Gehandicaptenplaats"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Parkeergeld"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Wasstraat"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Autowasstraat bewerken"
@@ -13040,5 +12934,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Winkel"
@@ -13046,15 +12940,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Winkel met autoonderdelen bewerken"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Garage"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Autogarage bewerken"
@@ -13062,5 +12956,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Verhuur"
@@ -13069,10 +12963,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Autoverhuur bewerken"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Autodelen"
@@ -13080,5 +12974,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Autodelen bewerken"
@@ -13086,5 +12980,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Fietsenstalling bewerken"
@@ -13093,5 +12987,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Fietsenverhuur bewerken"
@@ -13100,15 +12994,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Fietswinkel bewerken"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Openbaar vervoer"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-referentie"
@@ -13116,5 +13010,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Onbemand station"
@@ -13122,5 +13016,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Onbemand station bewerken"
@@ -13128,5 +13022,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Tramhalte"
@@ -13135,5 +13029,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Tramhalte bewerken"
@@ -13141,5 +13035,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Perron"
@@ -13148,5 +13042,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Perron bewerken"
@@ -13158,5 +13052,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "Referentie (tracknummer)"
@@ -13164,10 +13058,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Gebied"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Metroingang"
@@ -13176,10 +13070,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Metroingang bewerken"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -13188,5 +13082,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Busstation"
@@ -13195,5 +13089,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Busstation bewerken"
@@ -13201,5 +13095,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Bushalte"
@@ -13209,5 +13103,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Bushalte bewerken"
@@ -13215,10 +13109,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Busstation"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Busplatform bewerken"
@@ -13226,5 +13120,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13232,5 +13126,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Taxistandplaats bewerken"
@@ -13238,5 +13132,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Luchthaven"
@@ -13244,15 +13138,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13261,5 +13155,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Accomodatie"
@@ -13271,5 +13165,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -13278,15 +13172,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Hotel bewerken"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Sterren"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motel"
@@ -13294,20 +13188,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Motel bewerken"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Pension"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Chalet"
@@ -13315,10 +13209,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Chalet bewerken"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Hostel"
@@ -13326,30 +13220,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Hostel bewerken"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -13357,10 +13251,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Kampeerterrein bewerken"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -13371,5 +13265,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -13377,5 +13271,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Restaurant bewerken"
@@ -13383,5 +13277,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Franse keuken"
@@ -13389,61 +13283,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "Italiaanse keuken"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -13451,9 +13345,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Café"
@@ -13461,10 +13355,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Café bewerken"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Kroeg"
@@ -13472,20 +13366,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Kroeg bewerken"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr ""
@@ -13493,10 +13387,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -13504,20 +13398,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
@@ -13526,22 +13420,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Openingstijden"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "Museum"
@@ -13549,10 +13432,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -13561,10 +13444,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -13572,25 +13455,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -13598,5 +13481,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr "Kunstwerk bewerken"
@@ -13604,77 +13487,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "kaart"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "stadskaart"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "wandelkaart"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "fietskaart"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr "bord"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr "Wild"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Schuilplaats"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
@@ -13682,25 +13577,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Vuurplaats"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Kasteel"
@@ -13709,20 +13604,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -13731,20 +13626,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Slagveld"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Slagveld bewerken"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -13752,56 +13659,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Slagveld"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Slagveld bewerken"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Speelveld"
@@ -13809,15 +13705,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
@@ -13825,15 +13721,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -13847,6 +13743,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -13925,4 +13821,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14214,28 +14118,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "sport"
@@ -14245,227 +14150,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "Football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -14504,191 +14409,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "Sportveld"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "Sportcentrum"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Fietsen"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Skiën"
@@ -14696,56 +14601,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "middelzwaar"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "gevorderd"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "expert"
 
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "Schieten"
@@ -14753,178 +14660,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Football bewerken"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Rugby bewerken"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Gebouwen"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Gebouw"
@@ -14932,5 +14839,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -14938,10 +14845,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -14949,10 +14856,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Ambassade"
@@ -14960,10 +14867,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -14972,10 +14879,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Gevangenis"
@@ -14984,10 +14891,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Politie"
@@ -14997,10 +14904,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -15009,10 +14916,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -15020,5 +14927,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -15026,15 +14933,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "School"
@@ -15042,10 +14949,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Universiteit"
@@ -15053,10 +14960,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Campus"
@@ -15064,5 +14971,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -15070,5 +14977,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -15077,10 +14984,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Bibliotheek"
@@ -15089,10 +14996,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -15100,10 +15007,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Theater"
@@ -15112,10 +15019,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -15125,5 +15032,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -15132,6 +15039,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Religie"
@@ -15140,66 +15047,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
+msgstr "Italiaanse keuken"
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Benaming"
@@ -15208,81 +15116,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Adressen"
@@ -15291,5 +15199,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -15297,5 +15205,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Huisnummer"
@@ -15303,20 +15211,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Landcode"
@@ -15324,5 +15232,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -15331,5 +15239,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -15337,67 +15245,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "alles"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "Atletiek"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Fabriek"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Toren"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -15405,10 +15318,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Windmolen"
@@ -15416,10 +15329,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -15427,10 +15340,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -15440,10 +15353,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Kraan"
@@ -15451,10 +15364,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Baken"
@@ -15462,10 +15375,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -15473,10 +15386,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -15484,5 +15397,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
@@ -15490,5 +15403,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -15498,39 +15411,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Krachtcentrale"
@@ -15539,10 +15452,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Krachtcentrale bewerken"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -15551,5 +15464,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -15557,10 +15470,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -15571,5 +15484,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
@@ -15577,5 +15490,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -15584,25 +15497,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Hoeveelheid draden"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Toiletten"
@@ -15610,25 +15523,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Referentienummer"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Lading"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telefoon"
@@ -15637,5 +15545,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -15643,5 +15551,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Munten"
@@ -15649,5 +15557,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Briefgeld"
@@ -15655,5 +15563,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -15661,5 +15569,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -15667,15 +15575,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Recycling"
@@ -15684,5 +15592,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -15690,35 +15598,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Bank"
@@ -15727,20 +15635,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Verborgen"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Afgesloten"
@@ -15748,22 +15656,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Fontein"
@@ -15772,10 +15680,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -15784,10 +15692,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr ""
@@ -15795,25 +15703,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr ""
@@ -15821,10 +15729,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -15832,10 +15740,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -15843,5 +15751,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -15849,88 +15757,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "frisdrank"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
-msgstr "Hondenpoepzakjes"
+msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Slager"
@@ -15938,10 +15846,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Slager bewerken"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Bakker"
@@ -15949,10 +15857,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Bakker bewerken"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Bloemist"
@@ -15960,70 +15868,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "School"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Schoenenwinkel bewerken"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Dranken"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Slijterij bewerken"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -16031,10 +15953,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Tuincentrum bewerken"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -16042,10 +15964,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelf-zaak"
@@ -16053,60 +15975,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
-msgstr "Doe-het-zelf-zaak bewerken"
+msgstr "Doe-het-zelfzaak bewerken"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "Videotheek"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -16114,10 +16036,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Stomerij bewerken"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Wasserette"
@@ -16125,10 +16047,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Wasserette bewerken"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -16136,35 +16058,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Buitensportzaak bewerken"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "Sportartikelen"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Sport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "Opticiën"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Bank"
@@ -16172,5 +16096,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Bank bewerken"
@@ -16178,10 +16102,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -16189,5 +16113,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -16195,15 +16119,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Huisarts"
@@ -16211,20 +16135,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -16232,5 +16156,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -16238,10 +16162,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -16249,10 +16173,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -16261,5 +16185,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -16268,20 +16192,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -16289,5 +16213,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -16296,25 +16220,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Land bewerken"
@@ -16322,45 +16246,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Provincie"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Regio"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr ""
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Stad"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Dorp"
@@ -16368,10 +16293,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -16379,30 +16304,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr ""
@@ -16410,10 +16336,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Eiland"
@@ -16421,5 +16347,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Eiland bewerken"
@@ -16427,5 +16353,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -16433,10 +16359,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Bergtop"
@@ -16444,10 +16370,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -16455,10 +16381,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -16466,70 +16392,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Landsgrens"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Boom"
@@ -16538,15 +16464,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Bos"
@@ -16555,5 +16481,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Bos bewerken"
@@ -16561,17 +16487,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "naaldbomen"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Bosbouw"
@@ -16580,19 +16506,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Puinhelling"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Puinhelling bewerken"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Kreupelhout"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Kreupelhout bewerken"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Heide"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Heide bewerken"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -16601,70 +16571,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "Weide"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Tuin"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Gras"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -16672,10 +16643,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Algemeen"
@@ -16683,20 +16654,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -16704,5 +16675,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -16710,15 +16681,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -16726,9 +16697,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -16736,39 +16707,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr ""
@@ -16776,114 +16747,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Militair terrein"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Militair terrein bewerken"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Bouwterrein"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Bouwterrein bewerken"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Bouwterrein"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Bouwterrein bewerken"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Militair terrein"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Militair terrein bewerken"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Puinhelling"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Puinhelling bewerken"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Kreupelhout"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Kreupelhout bewerken"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Heide"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Heide bewerken"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -16893,5 +16821,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -16900,10 +16828,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "buitensegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "binnensegment"
@@ -16911,5 +16839,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -16918,5 +16846,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -16924,34 +16852,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -16960,15 +16888,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "naar weg"
@@ -16976,5 +16904,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16983,5 +16911,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16989,5 +16917,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -17059,24 +16987,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "fiets"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -17121,4 +17049,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17128,19 +17059,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "voet"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -17154,10 +17086,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -17165,26 +17097,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr ""
@@ -17193,30 +17125,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17400,4 +17332,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17409,4 +17448,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17508,11 +17556,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "vervallen"
@@ -17554,7 +17604,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "paard"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Barrières"
 
 #. color tertiary
@@ -17590,6 +17855,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "straat"
@@ -17645,7 +17910,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "snelwegroute"
@@ -17692,108 +17957,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "spoor"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viaduct"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17810,4 +17988,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "toegangsweg"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17817,4 +18001,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Doorwaadplek"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17831,8 +18021,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "Omkeermogelijkheid"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "EHBO-post"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17844,5 +18048,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "rivierbank"
@@ -17856,5 +18060,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "stroom"
@@ -17868,5 +18072,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "dok"
@@ -17894,5 +18098,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "aquaduct"
@@ -17907,4 +18111,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17944,5 +18149,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18059,12 +18264,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "kunstmatig"
@@ -18110,5 +18316,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18126,7 +18332,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr "spoorwegpunt"
@@ -18149,10 +18355,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr "ander spoor"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr "spoorovergang"
@@ -18182,6 +18388,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr "oud spoor"
@@ -18226,6 +18432,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "luchtverbinding"
@@ -18239,5 +18445,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminal"
@@ -18259,5 +18465,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "luchtverbinding_donker"
@@ -18271,5 +18477,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "luchtverbinding_licht"
@@ -18292,4 +18498,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18309,4 +18523,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "kabelbaan"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18315,23 +18535,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "kabelbaan"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "piste_eenvoudig"
@@ -18345,5 +18552,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "piste_middelmatig"
@@ -18357,5 +18565,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "piste_gevorderden"
@@ -18368,6 +18577,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "piste_vrijekuur"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "piste_vrijekuur"
@@ -18381,5 +18605,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "piste_beginner"
@@ -18410,4 +18635,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18442,4 +18675,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18452,8 +18709,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "kracht"
@@ -18466,5 +18725,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "pijler"
@@ -18478,5 +18740,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "pijplijn"
@@ -18604,12 +18866,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "vrije tijd"
@@ -18623,5 +18885,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "jachthaven"
@@ -18693,8 +18955,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "voorziening"
@@ -18730,4 +18992,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18787,11 +19057,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "voorziening_verkeer"
@@ -18930,6 +19200,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19156,22 +19447,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "voorziening_licht"
@@ -19203,6 +19494,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "licht_water"
@@ -19238,4 +19529,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19255,7 +19554,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "gezondheid"
@@ -19349,4 +19649,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19549,4 +19857,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19580,28 +19904,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "winkel"
@@ -19655,4 +19981,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19665,8 +19999,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotel"
@@ -19721,4 +20055,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19815,9 +20150,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "toerisme"
@@ -19889,8 +20224,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "historisch"
@@ -19960,9 +20295,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "groen"
@@ -19976,5 +20311,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "mijnbouw"
@@ -19988,5 +20323,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "vuilstortplaats"
@@ -20008,5 +20343,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "estuarium"
@@ -20020,5 +20355,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "bosbouw"
@@ -20032,5 +20367,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "landbouwgrond"
@@ -20053,5 +20388,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "winkelcentrum"
@@ -20065,5 +20400,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "industrieel"
@@ -20077,5 +20412,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "braakliggend gebied"
@@ -20089,5 +20424,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "ontwikkelingsgebied"
@@ -20101,5 +20436,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "Rangeerterrein"
@@ -20156,7 +20491,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "militair gebruik"
@@ -20170,5 +20505,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "begraafplaats"
@@ -20181,5 +20516,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "berg of -heuveltop"
@@ -20194,5 +20529,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "gletsjer"
@@ -20206,5 +20541,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "vulkaan"
@@ -20219,4 +20554,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20258,7 +20594,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "Natuurlijk"
@@ -20272,5 +20609,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "ruig land"
@@ -20284,5 +20621,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "heide"
@@ -20296,5 +20633,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "oerbos"
@@ -20308,5 +20645,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "slikgronden"
@@ -20320,5 +20657,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "strand"
@@ -20396,8 +20733,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "route"
@@ -20445,7 +20782,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "grens"
@@ -20587,10 +20924,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "plaats"
@@ -20631,6 +20968,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "adres"
@@ -20912,259 +21256,45 @@
 msgstr "Straten NRW Geofabrik.de"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "Als je GPS-apparaat te weinig lijnen tekent, selecteer dit om lijnen "
-#~ "langs je pad te tekenen."
-
-#~ msgid "Navigate"
-#~ msgstr "Navigeren"
-
-#~ msgid "Navigator"
-#~ msgstr "Navigator"
-
-#~ msgid "Set start/end for routing. Middle mouse button to reset."
-#~ msgstr ""
-#~ "Begin- of eindpunt voor routering instellen. Middelste muisknop herstelt."
-
-#~ msgid "Reset Graph"
-#~ msgstr "Grafiek herstellen"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Een selectie uit de conflictenlijst maken."
-
-#~ msgid "Please select a color."
-#~ msgstr "Selecteer een kleur."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Niet in volschermmodus starten"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Nieuws over JOSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Klik om een nieuwe weg aan een bestaande knoop vast te maken"
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Klik om een koppeling met een bestaande knoop te maken."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Klik om een knoop in te voegen en een nieuwe weg te maken."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Klik om een nieuwe knoop toe te voegen en een verbinding te maken."
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr "Selecteer objecten waarvan de eigenschappen moeten veranderen."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "Dit is een eenvoudig relatieeditor waarmee je de relatietags en de leden "
-#~ "kan bewerken. Daarnaast zouden we een uitgebreide editor moeten hebben "
-#~ "die het soort relatie detecteert en de keuzen op een passende manier "
-#~ "beperkt."
-
-#~ msgid "Highlight the member from the current table row as JOSM's selection"
-#~ msgstr "De leden in de huidige tabelrij markeren als JOSM's selectie"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Dit spoor uploaden..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Deze functionaliteit is recent toegevoegd. Gebruikt het<br> "
-#~ "voorzichtig en controleer of het werkt zoals verwacht.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Track gefilterd door JOSM uploaden"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Raw-bestand uploaden: "
-
-#~ msgid "Description:"
-#~ msgstr "Beschrijving:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Tags (trefwoord in GPX):"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "GPX-upload"
-
-#~ msgid "time"
-#~ msgstr "tijd"
-
-#~ msgid "desc"
-#~ msgstr "beschr"
-
-#~ msgid "symbol"
-#~ msgstr "symbool"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Raw-bestand uploaden: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Tags:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "De tint van de trackkleur bepalen door de snelheid op dat punt."
-
-#~ msgid "Unknown type"
-#~ msgstr "Onbekend type"
-
-#~ msgid "NullPointerException, Possibly some missing tags."
-#~ msgstr "NullPointer-uitzondering, mogelijk door ontbrekende tags."
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} resteert)..."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Snelwegafrit bewerken"
-
-#~ msgid "Exit Number"
-#~ msgstr "Afritnummer"
-
-#~ msgid "Exit Name"
-#~ msgstr "Afritnaam"
-
-#~ msgid "Waterway"
-#~ msgstr "Waterweg"
-
-#~ msgid "Information point"
-#~ msgstr "Informatiepunt"
-
-#~ msgid "Provider"
-#~ msgstr "Bank"
-
-#~ msgid "political"
-#~ msgstr "Grens kiesdistrict"
-
-#~ msgid "National_park"
-#~ msgstr "Nationaal park"
-
-#~ msgid "Natural"
-#~ msgstr "Natuurlijk"
-
-#~ msgid "Add Site"
-#~ msgstr "Site toevoegen"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Site(s) verwijderen"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Selecteer een site om te verwijderen."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Site(s) controleren"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Selecteer de site(s) om op updates te controleren."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Een nieuwe plugin-site toevoegen."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "De geselecteerde site(s) uit de lijst verwijderen."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr "De geselecteerde site(s) op nieuwe plugins of updates controleren."
-
-#~ msgid "Update Sites"
-#~ msgstr "Sites updaten"
-
-#~ msgid "Version"
-#~ msgstr "Versie"
-
-#~ msgid "Install"
-#~ msgstr "Installeer"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Versie: {0}<br>Laatste verandering op {1}"
-
-#~ msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-#~ msgstr "SurveyorPlugin is afhankelijk van LiveGpsPlugin!"
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr "LiveGpsPlugin is gevonden, installeer en activeer deze a.u.b."
-
-#~ msgid "SurveyorPlugin is disabled for the moment"
-#~ msgstr "SurveyorPlugin is op dit moment uitgeschakeld"
-
-#~ msgid "SurveyorPlugin"
-#~ msgstr "SurveyorPlugin"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Versie {0} - Laatste aanpassing op {1}"
-
-#~ msgid "Open waypoints file"
-#~ msgstr "Waypointsbestand openen"
-
-#~ msgid "Open a waypoints file."
-#~ msgstr "Een waypointsbestand openen."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "Gegevensfout: lat-waarde \"{0}\" ligt buiten het bereik."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "Gegevensfout: lon-waarde \"{0}\" ligt buiten het bereik."
-
-#~ msgid "Signpost"
-#~ msgstr "Uitkijkpost"
-
-#~ msgid "office"
-#~ msgstr "kantoor"
-
-#~ msgid "guidepost"
-#~ msgstr "wegwijzer"
-
-#~ msgid "NoName"
-#~ msgstr "Geen-naam"
-
-#~ msgid "Ref"
-#~ msgstr "Ref"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Site-URL updaten"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Ongeldige URL"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "\"Dagmelding\" downloaden"
-
-#~ msgid "Open map features in browser"
-#~ msgstr "Kaarteigenschappen in browser openen"
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "De \"{0}\"-weg moet uit minstens 2 knopen bestaan."
-
-#~ msgid "Upload GPX track"
-#~ msgstr "GPX-track uploaden"
-
-#~ msgid "Direct Upload to OpenStreetMap"
-#~ msgstr "Direct uploaden naar OpenStreetMap"
-
-#~ msgid "Starting to upload selected file to openstreetmap.org"
-#~ msgstr "Geselecteerd bestand wordt naar openstreetmap.org geupload"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "Hoeveel gebouwen zijn er in het terras?"
-
-#~ msgid "Update available"
-#~ msgstr "Update beschikbaar"
-
-#~ msgid "Version Details:"
-#~ msgstr "Versie details:"
-
-#~ msgid ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
-#~ msgstr ""
-#~ "Jouw versie: {2}; Huidige versie: {0} <font style=\"font-size:x-small\">"
-#~ "(nieuwste ongetest: {1} &#150; niet aangeraden)</font>"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Openen..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Beschrijving"
+
+#~ msgid "Commit comment"
+#~ msgstr "Opmerking bevestigen"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Server ondersteunt geen changesets"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigatie"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Kabelbrug"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Kabelbrug bewerken"
+
+#~ msgid "Portcullis"
+#~ msgstr "Valhek"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Valhek bewerken"
+
+#~ msgid "Charge"
+#~ msgstr "Lading"
+
+#~ msgid "sports"
+#~ msgstr "Sportartikelen"
+
+#~ msgid "viaduct"
+#~ msgstr "viaduct"
Index: /applications/editors/josm/i18n/po/pl.po
===================================================================
--- /applications/editors/josm/i18n/po/pl.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/pl.po	(revision 14844)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-28 13:07+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-13 18:35+0000\n"
 "Last-Translator: Łukasz Jernaś <deejay1@srem.org>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
@@ -17,12 +17,12 @@
 "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-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-Language: Polish\n"
-"X-Poedit-Basepath: ../dev/josm/i18n/\n"
+"X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Przygotowywanie interfejsu użytkownika"
@@ -40,39 +40,39 @@
 msgstr "Odwzorowanie nie mogło zostać odczytane z ustawień. Używanie EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "Wskazówka: Niektóre zmiany powstały z powodu wysłania danych na serwer."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Niezapisane zmiany"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Zmiany nie zostały zapisane. Odrzucić je?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Zapisz i wyjdź"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Porzuć i wyjdź"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -83,10 +83,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -97,4 +97,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -104,10 +105,10 @@
 msgstr "Anuluj"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -133,8 +134,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -161,5 +162,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:140
 msgid "Homepage"
-msgstr "Strona Domowa"
+msgstr "Strona domowa"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
@@ -275,5 +276,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -337,5 +338,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
 msgid "download"
-msgstr ""
+msgstr "pobrany obszar"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:52
@@ -387,10 +388,9 @@
 "The selected ways have differing relation memberships.  Do you still want to "
 "combine them?"
-msgstr ""
-"Wybrane drogi są częścią różnych relacji. Czy nadal chcesz je połączyć?"
+msgstr "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 msgid "Combine Anyway"
-msgstr ""
+msgstr "Połącz mimo tego"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141
@@ -410,31 +410,33 @@
 msgstr "Odwróć i połącz"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
 msgid "Enter values for all conflicts."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+msgstr "Podaj wartości dla wszystkich konfliktów."
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Rozwiąż konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Połącz {0} dróg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Wszystkie trasy są puste"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
 "nodes)"
 msgstr ""
+"Połączenie dróg jest niemożliwe (Drogi nie mogą był złączone w jeden ciąg "
+"węzłów)"
 
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
@@ -511,9 +513,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124
 msgid "Distribute Nodes"
-msgstr ""
+msgstr "Rozmieść węzły"
 
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr ""
+"Rozmieszcza wybrane węzły tak by znajdowały się w równych odległościach na "
+"jednej linii."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
@@ -532,5 +536,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -543,5 +547,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69
 msgid "Please select at least one task to download"
-msgstr ""
+msgstr "Należy wybrać przynajmniej jeden element do pobrania"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -570,13 +574,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26
 msgid "OSM Server Files"
-msgstr ""
+msgstr "Pliki serwera OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27
 msgid "GPX Files"
-msgstr ""
+msgstr "Pliki GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:28
 msgid "NMEA-0183 Files"
-msgstr ""
+msgstr "Pliki NMEA-0183"
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
@@ -651,6 +655,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -659,6 +663,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -714,4 +718,5 @@
 msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr ""
+"Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:212
@@ -721,4 +726,6 @@
 "\">your language</A>."
 msgstr ""
+"Brak strony pomocy. Możesz ją utworzyć po <a href=\"{0}\">angielsku</a> lub "
+"<A HREF=\"{1}\">po polsku</A>."
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:25
@@ -736,4 +743,6 @@
 "elements have a history."
 msgstr ""
+"Wybierz co najmniej jeden węzeł, drogę lub relację. Tylko wcześniej "
+"przesłane elementy posiadają historię."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -779,7 +788,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
 msgid "Merge Anyway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+msgstr "Scal mimo tego"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -787,5 +796,5 @@
 "używana."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -883,9 +892,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:134
 msgid "Coordinates imported: "
-msgstr ""
+msgstr "Liczba wczytanych współrzędnych: "
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:135
 msgid "Malformed sentences: "
-msgstr ""
+msgstr "Nieprawidłowe sekwencje: "
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:136
@@ -900,5 +909,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:139
 msgid "Zero coordinates: "
-msgstr ""
+msgstr "Zerowe współrzędne: "
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:143
@@ -925,5 +934,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
 msgid "Enter URL to download:"
-msgstr ""
+msgstr "Podaj adres z którego pobrać dane:"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
@@ -933,5 +942,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 msgid "Download URL"
-msgstr ""
+msgstr "Adres URL"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
@@ -969,4 +978,7 @@
 "projection to get rid of this warning.<br>Do you want to continue?"
 msgstr ""
+"<html>Ustawiono odwzorowanie EPSG:4326, które może powodować<br> niepożądane "
+"wyniki przy wyrównywaniu do prostokąta.<br> Należy zmienić rodzaj "
+"odwzorowania, aby wyłączyć to ostrzeżenie.<br> Czy kontynuować?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
@@ -1060,65 +1072,69 @@
 msgstr "Zapisuje bieżące dane."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
 "a bug."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+"Błąd wewnętrzny: proszę zgłosić błąd dla komunikatu: \"cannot check "
+"conditions for no layer\"."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Pusty dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Dokument nie zawiera żadnych danych."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+msgstr "Zapisz pomimo tego"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
 "if you rejected all. Continue?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+"Pozostały nierozwiązane konflikty. Wszystkie konfliktowe przypadki zostaną "
+"odrzucone. Czy kontunuować?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+msgstr "Odrzuć konflikty i zapisz"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Zapisz plik GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Zapisz plik OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Nie można utworzyć kopii zapasowej pliku."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Nieznane rozszerzenie pliku."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Wystąpił błąd podczas zapisywania."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Wystąpił błąd podczas przywracania pliku kopii zapasowej."
@@ -1147,9 +1163,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show Status Report"
-msgstr ""
+msgstr "Pokazuje raport konfiguracji programu"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
+"Pokazuje raport zawierający użyteczne informacje, które mogą być dołączone "
+"do informacji o błędzie."
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
@@ -1160,5 +1178,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
 msgid "Status Report"
-msgstr ""
+msgstr "Raport konfiguracji"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93
@@ -1172,18 +1190,18 @@
 msgstr "Zamknij"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Rozdziel drogę"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Rozdziela drogę w zaznaczonym węźle."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1192,5 +1210,5 @@
 msgstr[2] "Wybrane węzły nie są w środku żadnej drogi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1199,12 +1217,13 @@
 "There is more than one way using the nodes you selected. Please select the "
 "way also."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+msgstr[0] "Więcej niż jedna droga używa wybrany węzeł. Wybierz także drogę."
+msgstr[1] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę."
+msgstr[2] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "Wybrane węzły nie współdzielą tej samej trasy."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1213,10 +1232,10 @@
 msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musisz wybrać dwa lub więcej węzłów aby rozdzielić drogę okrężną."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1226,5 +1245,5 @@
 "węzły w środku drogi.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1232,5 +1251,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1274,5 +1293,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "The current selection cannot be used for unglueing."
-msgstr ""
+msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
@@ -1282,5 +1301,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
 msgid "* One tagged node, or"
-msgstr ""
+msgstr "* Jeden węzęł z tagami lub"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
@@ -1318,5 +1337,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:159
 msgid "Unglued Node"
-msgstr ""
+msgstr "Rozdzielenie węzła"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:372
@@ -1364,9 +1383,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
 msgid "Update Data"
-msgstr ""
+msgstr "Zaktualizuj dane"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
 msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr ""
+msgstr "Aktualizuje bieżącą warstwę danych z serwera (ponownie pobiera dane)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:71
@@ -1374,4 +1393,6 @@
 "No data to update found. Have you already opened or downloaded a data layer?"
 msgstr ""
+"Nie znaleziono danych do aktualizacji. Czy została pobrana lub otwarta "
+"jakakolwiek warstwa danych?"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:77
@@ -1382,46 +1403,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Wyślij do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Wysyła wszystkie zmiany na serwer OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Obiekty do dodania:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Obiekty do zmiany:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Obiekty do usunięcia:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Czy wysłać te zmiany?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Wyślij zmiany"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie ma nic do wysłania. Wprowadź jakieś dane."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Istnieją nierozwiązane konflikty. Musisz je najpierw rozwiązać."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Brak zmian do wysłania."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Przesyłanie danych"
@@ -1517,5 +1542,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47
 msgid "Downloaded GPX Data"
-msgstr ""
+msgstr "Pobrane dane GPX"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78
@@ -1534,5 +1559,5 @@
 #, java-format
 msgid "Data Layer {0}"
-msgstr ""
+msgstr "Warstwa danych {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:83
@@ -1547,13 +1572,13 @@
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
-msgstr ""
+msgstr "Pobieranie {0} z {1} (pozostało: {2})"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:88
 msgid "The following errors occured during mass download:"
-msgstr ""
+msgstr "Podczas pobierania wystąpiły następujące błędy:"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:89
 msgid "Errors during Download"
-msgstr ""
+msgstr "Błędy podczas pobierania"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
@@ -1606,31 +1631,33 @@
 msgstr "Nie można dodać węzła poza granicami świata."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Dodaj węzeł"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Dodaj węzeł do drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
-msgstr ""
-
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+msgstr "Utwórz nowy węzeł."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Zaznacz węzeł pod kursorem."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1640,9 +1667,4 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
 msgid "Start new way from last node."
@@ -1656,10 +1678,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:924
 msgid "Finish drawing."
-msgstr ""
+msgstr "Zakończ rysowanie."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
 msgid "Extrude"
-msgstr ""
+msgstr "Wytłocz"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
@@ -1669,5 +1691,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248
 msgid "Extrude Way"
-msgstr ""
+msgstr "Wytłocz drogę"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
@@ -1842,5 +1864,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
 msgid "<b>untagged</b> - all untagged objects"
-msgstr ""
+msgstr "<b>untagged</b> - wszystkie obiekty bez tagów"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
@@ -1863,20 +1885,20 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "Start Search"
-msgstr ""
+msgstr "Rozpocznij szukanie"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:171
 #, java-format
 msgid "No match found for ''{0}''"
-msgstr "Nie znaleziono nic dla ''{0}''"
+msgstr "Nie znaleziono nic szukając ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:173
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
-msgstr ""
+msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:175
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr ""
+msgstr "Niczego nie usunięto z zaznaczenia szukając \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
@@ -2050,5 +2072,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2246,5 +2268,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "tory kolejowe"
@@ -2267,127 +2289,127 @@
 msgstr[2] "{0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Nieznana rola \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "nieotagowany"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "tekst"
@@ -2395,5 +2417,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2422,5 +2444,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "tło"
@@ -2428,5 +2450,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
 msgid "highlight"
-msgstr ""
+msgstr "wyróżnienie"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:23
@@ -2460,9 +2482,9 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:158
 msgid "Lambert Zone (France)"
-msgstr ""
+msgstr "odwzorowanie Lamberta (Francja)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
-msgstr ""
+msgstr "odwzorowanie Lamberta (Estonia)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:36
@@ -2482,5 +2504,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2494,5 +2516,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2507,6 +2529,7 @@
 msgid "{0} object has conflicts:"
 msgid_plural "{0} objects have conflicts:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} obiekt ma konflikt:"
+msgstr[1] "{0} obiekty mają konflikt:"
+msgstr[2] "{0} obiektów ma konflikt:"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
@@ -2522,14 +2545,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Wiadomość dnia jest niedostępna"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+msgstr "- używasz wersji {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Pobieranie wiadomości dnia"
@@ -2595,14 +2618,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Hasło"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -2610,57 +2633,57 @@
 "Nie udało się odnaleźć tłumaczenia dla języka: {0}. Użyty zostanie {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "użycie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "opcje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Wyświetl tę pomoc"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
+msgid "Standard unix geometry argument"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+msgid "Download the bounding box"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
-msgid "Standard unix geometry argument"
+msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
-msgid "Download the bounding box"
+msgid "Download the bounding box as raw gps"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgid "Select with the given search"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
-msgid "Open file (as raw gps, if .gpx)"
+msgid "Launch in maximized mode"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
-msgid "Download the bounding box as raw gps"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
-msgid "Select with the given search"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
-msgid "Launch in maximized mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Reset the preferences to default"
 msgstr "Przywróć domyślne ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Ustaw język"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "przykłady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2668,23 +2691,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Aktywacja zaktualizowanych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Ładowanie wczesnych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Zapisywanie domyślnych ustawień"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Ładowanie wtyczek"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2726,9 +2754,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242
 msgid "Full Screen"
-msgstr ""
+msgstr "Pełny ekran"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:244
 msgid "Toggle Full Screen view"
-msgstr ""
+msgstr "Przełącza widok na pełen ekran"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:283
@@ -2821,18 +2849,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
 msgid "false: the property is explicitly switched off"
-msgstr ""
+msgstr "fałsz: ten opcja jest zawsze wyłączona"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:91
 msgid "true: the property is explicitly switched on"
-msgstr "prawda: właściwość jest domyśłnie ustawiona"
+msgstr "prawda: ta opcja jest zawsze włączona"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96
 msgid ""
 "partial: different selected objects have different values, do not change"
-msgstr ""
+msgstr "częściowe: różne zaznaczone obiekty mają różne wartości - nie zmienia"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
 msgid "unset: do not set this property on the selected objects"
-msgstr "nieustawione: nie ystawiaj tej właściwości na zaznaczonych obiektach"
+msgstr "nieustawione: nie ustawiaj tej opcji dla zaznaczonych obiektach"
 
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
@@ -2862,5 +2890,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -2933,5 +2961,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:129
 msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
+msgstr "Ponownie wczytuje wszystkie zaznaczone obiekty i odświeża listę."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135
@@ -3073,5 +3101,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Rola"
@@ -3119,73 +3147,71 @@
 msgstr "Właściwości / członkostwo"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Zastosuj zmiany"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Tworzy nową relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Edytuje nową relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Modyfikuj relację #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Podstawowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Zajęte przez"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Etykiety (ustawienie wartości na pustą usuwa etykietę)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Członkowie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Przesuń w górę"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Dodaj zaznaczone"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Usuń zaznaczone"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Usuń wszystkie zaznaczone obiekty z relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Przesuń w dół"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3194,36 +3220,36 @@
 msgstr "Usuń"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Pobierz członków"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Członkowie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Edytor relacji: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Wystąpiły konfikty podczas importowania."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Błąd podczas parsowania odpowiedzi serwera."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Nie można połączyć się z serwerem."
@@ -3237,10 +3263,11 @@
 msgstr "Usuwa zaznaczoną relację."
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relacje"
@@ -3435,5 +3462,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Miejsca"
@@ -3480,21 +3507,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "rodzaj"
@@ -3545,10 +3572,7 @@
 msgstr "Możesz użyć myszki lub Ctrl+strzałki/./ aby powiększać i przesuwać."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Mapa"
@@ -3703,4 +3727,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3809,5 +3834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3868,19 +3893,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "poza pobranym obszarem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Wersja {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "Obiekty na warstwie {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} usuniętych.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "użycie"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Wersja {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3888,21 +3928,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4331,5 +4371,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4414,4 +4454,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4495,7 +4537,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4508,7 +4547,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4524,10 +4570,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4696,5 +4742,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4728,7 +4776,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4812,4 +4860,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4862,4 +4918,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4868,7 +4930,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4877,15 +4936,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4910,129 +4958,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Nazwa"
@@ -5078,15 +5128,13 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:504
 msgid "All"
-msgstr ""
+msgstr "wszystkie"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "okolica"
+msgstr "pliki lokalne"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Uwagi"
+msgstr "żadne"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5100,9 +5148,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
 msgid "Velocity (red = slow, green = fast)"
-msgstr ""
+msgstr "Prędkość (czerwony = wolno, zielony = szybko)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
 msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr ""
+msgstr "Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
@@ -5113,45 +5161,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Samochód"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Rowery"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5159,25 +5197,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Ruch pieszy"
@@ -5225,7 +5268,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Rysuj linie pomiędzy punktami GPS."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5613,5 +5655,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:52
 msgid "disabled"
-msgstr ""
+msgstr "zablokowane"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:53
@@ -5837,11 +5879,11 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr ""
 "Wyjątek NullPointerException, prawdopodobnie brakuje jakichś znaczników."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Przygotowywanie danych..."
@@ -5851,25 +5893,75 @@
 msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Otwieranie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Zamykanie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Brak zmian do wysłania."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Przygotowywanie..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Wysyłanie..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Błąd podczas parsowania odpowiedzi serwera."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Nieznany adres"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Nieprawidłowe hasło lub nazwa użytkownika."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Uwaga: Hasło nie jest szyfrowane podczas transmisji."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Zapisz nazwę użytkownika i hasło (nieszyfrowane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Wprowadź hasło"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Logowanie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5880,44 +5972,52 @@
 msgstr "Błąd parsowania danych"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Nieznana wersja"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Nieznana wersja"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> nie posiada referencji"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Znaleziono tag <member> w"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Niekompletny opis <member> z ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Niedozwolony obiekt z id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Brak wymaganego atrybutu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Pomijanie drogi, ponieważ zawiera ona węzeł, który nie istnieje: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Przygotowywanie danych OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Zły format identyfikatora węzła"
@@ -5927,5 +6027,5 @@
 msgstr "Łączenie z serwerem..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -5934,5 +6034,5 @@
 "Internetem."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5942,55 +6042,8 @@
 "chwili."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Dołącz krótki opis zmian, które wysyłasz do serwera:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Komentarz zmiany"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} pozostało. Przesyłanie {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Wystąpił błąd: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Otwieranie zestawu zmian..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Serwer nie wspiera wersjonowania"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Nieznany adres"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Przygotowywanie..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Wysyłanie..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Zamykanie zestawu zmian..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6165,6 +6218,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "nieznany"
@@ -6214,5 +6267,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107
 msgid "Download Plugins"
-msgstr ""
+msgstr "Pobierz wtyczki"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168
@@ -6244,5 +6297,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212
 msgid "Delete and Download"
-msgstr ""
+msgstr "Usuń i pobierz"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217
@@ -6353,7 +6406,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Tworzenie obszarów."
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6372,7 +6424,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Tworzenie obszarów."
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6396,5 +6447,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Opis"
@@ -6832,4 +6883,6 @@
 "Please check its availibility on www.cadastre.gouv.fr"
 msgstr ""
+"Nie znaleziono miejscowości {0} lub nie jest ona dostępna w WMS.\n"
+"Proszę sprawdzić jej dostepność pod adresem www.gadastre.gouv.fr"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283
@@ -6847,5 +6900,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129
 msgid "Cadastre"
-msgstr ""
+msgstr "Kataster"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
@@ -7030,5 +7083,5 @@
 #, java-format
 msgid "Cadastre: {0}"
-msgstr ""
+msgstr "Kataster: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -7279,37 +7332,37 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
 msgid "Position only"
-msgstr ""
+msgstr "Tylko pozycja"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82
 msgid "Position, Time, Date, Speed"
-msgstr ""
+msgstr "Pozycja, czas, data i prędkość"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83
 msgid "Position, Time, Date, Speed, Altitude"
-msgstr ""
+msgstr "Pozycja, czas, data, prędkość, wysokość"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
 msgid "A By Time"
-msgstr ""
+msgstr "A wg. czasu"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
 msgid "A By Distance"
-msgstr ""
+msgstr "A wg. odległości"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
 msgid "B By Time"
-msgstr ""
+msgstr "B wg. czasu"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
 msgid "B By Distance"
-msgstr ""
+msgstr "B wg. odległości"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
 msgid "C By Time"
-msgstr ""
+msgstr "C wg. czasu"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
 msgid "C By Distance"
-msgstr ""
+msgstr "C wg. odległości"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
@@ -7450,25 +7503,25 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:108
 msgid "Previous image"
-msgstr ""
+msgstr "Poprzedni obrazek"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next image"
-msgstr ""
+msgstr "Następny obrazek"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144
 msgid "Rotate left"
-msgstr ""
+msgstr "Obróć w lewo"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146
 msgid "Rotate image left"
-msgstr ""
+msgstr "Obraca obrazek w lewo"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163
 msgid "Rotate right"
-msgstr ""
+msgstr "Obróć w prawo"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165
 msgid "Rotate image right"
-msgstr ""
+msgstr "Obraca obrazek w prawo"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187
@@ -7635,7 +7688,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "woda"
@@ -7928,5 +7981,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Wyświetla problemy z OpenStreetBugs"
@@ -7945,4 +7998,11 @@
 msgstr "Uwaga"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Wystąpił błąd: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7970,35 +8030,38 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Dodaj komentarz"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Wpisz swój komentarz"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Oznacz jako załatwiony"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Czy na pewno oznaczyć ten problem jako \"załatwiony\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Na pewno zamknąć?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Nowy problem"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Utwórz nowy problem"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Dokładnie opisz problem"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Utwórz nowy problem"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8027,5 +8090,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8035,9 +8098,9 @@
 "Ustawienia mapy w ustawieniach programu."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "opcje osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Ścieżka do programu Firefox"
@@ -8105,95 +8168,76 @@
 msgstr ""
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Nawigacja"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Nic"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-#, fuzzy
-msgid "Click to add route nodes."
-msgstr "Kliknij aby wstawić nowy węzeł."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-#, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Kliknij aby wstawić nowy węzeł."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Usuń zaznaczone"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
+msgid "Click to add destination."
+msgstr "dojazd do posesji"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "Otwiera listę wszystkich relacji"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "stacja"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+msgid "Add routing layer"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "średnia"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "obuwie"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Szybciej"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Odwróć kierunek dróg"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "trasa promu"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Ustawienia wtyczki WMS"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Skróty klawiaturowe"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "zjazd z autostrady"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Max. prędkość (km/h)"
+msgstr "Prędkość (km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Wysokość"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8201,33 +8245,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Mapa \"Slippy\""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr ""
@@ -8250,34 +8294,34 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr ""
@@ -8292,5 +8336,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8345,7 +8389,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Edycja stanu"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8360,33 +8403,28 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "węzeł"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "Wysokość"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "różne sporty"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Zmiana właściwości {0} obiektu."
-msgstr[1] "Zmiana właściwości {0} obiektów."
-msgstr[2] "Zmiana właściwości {0} obiektów."
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Zmiana właściwości {0} obiektu."
-msgstr[1] "Zmiana właściwości {0} obiektów."
-msgstr[2] "Zmiana właściwości {0} obiektów."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -8395,25 +8433,21 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "strumień"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Szukaj"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Plik"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Samochód"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8485,17 +8519,17 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:482
 msgid "Highest number"
-msgstr ""
+msgstr "Największy numer"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:483
 msgid "Lowest number"
-msgstr ""
+msgstr "Najmniejszy numer"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:484
 msgid "Interpolation"
-msgstr ""
+msgstr "Interpolacja"
 
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Nazwa ulicy"
@@ -8597,17 +8631,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relacja"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Nakładające się obszary"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Nakładające się obszary"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8618,12 +8649,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Rozwiązywanie konflików."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Usuń z relacji"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8632,17 +8661,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "zamknięta droga"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Usuń zdjęcie z warstwy"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "skrzyżowanie autostrad"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9228,4 +9254,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9307,7 +9339,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "budynek"
@@ -9321,5 +9353,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "obszar"
@@ -9593,4 +9625,9 @@
 msgstr ""
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9617,7 +9654,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Tworzenie obszarów."
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9708,21 +9744,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9731,15 +9774,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9749,15 +9792,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9766,5 +9809,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9773,5 +9816,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9780,5 +9823,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9868,5 +9911,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Numer"
@@ -9921,7 +9964,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Warstwa"
@@ -9964,5 +10007,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Max. prędkość (km/h)"
@@ -10010,5 +10053,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "jednokierunkowa"
@@ -10064,5 +10107,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "most"
@@ -10112,5 +10155,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "tunel"
@@ -10157,5 +10200,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "wykop"
@@ -10202,5 +10245,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "nasyp"
@@ -10358,6 +10401,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Szerokość (w metrach)"
@@ -10406,5 +10449,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Nawierzchnia"
@@ -10436,5 +10479,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr ""
@@ -10445,5 +10488,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr ""
@@ -10457,5 +10500,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "bruk"
@@ -10502,5 +10545,5 @@
 #: build/trans_presets.java:257
 msgid "driveway"
-msgstr ""
+msgstr "podjazd"
 
 #: build/trans_presets.java:257
@@ -10607,5 +10650,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10626,6 +10669,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "tak"
@@ -10769,7 +10812,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "nie"
@@ -10783,73 +10826,63 @@
 msgstr "Samochody dostawcze"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Konie"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motocykle"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Samochody"
@@ -10924,130 +10957,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Rodzaj"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11055,5 +10976,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11061,11 +10982,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11073,5 +10988,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11079,5 +10994,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11085,5 +11000,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11091,6 +11006,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11109,6 +11030,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "autostrada"
@@ -11134,6 +11055,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "droga ekspresowa"
@@ -11159,6 +11080,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "droga krajowa"
@@ -11184,6 +11105,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "droga wojewódzka"
@@ -11197,5 +11118,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "droga powiatowa"
@@ -11213,5 +11134,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "droga lokalna"
@@ -11229,5 +11150,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "droga serwisowa"
@@ -11254,6 +11175,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "w budowie"
@@ -11294,6 +11215,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11304,5 +11224,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "rondo"
@@ -11646,14 +11566,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Operator"
@@ -11678,20 +11598,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "sygnalizacja świetlna"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "wysepka"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "nieoznakowane"
@@ -11699,5 +11619,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11706,5 +11626,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11714,5 +11634,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11861,10 +11781,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Wysokość"
@@ -11877,29 +11798,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "przełaz"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Edycja przełazu"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "słupek drogowy"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Edycja słupka drogowego"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11908,7 +11818,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11917,75 +11830,43 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr ""
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "słupek drogowy"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Edycja słupka drogowego"
-
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Most zwodzony"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Edycja mostu zwodzonego"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
 msgid "Cattle Grid"
 msgstr "przeszkoda dla bydła"
@@ -11993,30 +11874,98 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
+#: build/trans_presets.java:851
 msgid "Edit Cattle Grid"
 msgstr "Edycja przeszkody dla bydła"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
 msgid "Spikes"
 msgstr "Kolczatka"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:865
 msgid "Edit Spikes"
 msgstr "Edycja kolczatki"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "brona"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Edycja brony"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "punkt poboru opłat"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Edycja punktu poboru opłat"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "przejście graniczne"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Edycja przejścia granicznego"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "żywopłot"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "ogrodzenie"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "mur"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "mury miejskie"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "mur oporowy"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Wejście"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Edycja wejścia"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "brama"
@@ -12024,128 +11973,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr "Edycja bramy"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "przełaz"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Edycja przełazu"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "żywopłot"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "ogrodzenie"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "mur"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "mury miejskie"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "mur oporowy"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "punkt poboru opłat"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Edycja punktu poboru opłat"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "przejście graniczne"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Edycja przejścia granicznego"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Wejście"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Edycja wejścia"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "zbiornik wodny"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "źródło"
@@ -12153,5 +12054,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "plaża"
@@ -12159,5 +12060,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "odpływ"
@@ -12165,10 +12066,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Edycja odpływu"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "strumień"
@@ -12176,10 +12077,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Edycja strumienia"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "kanał"
@@ -12187,10 +12088,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Edycja kanału"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "rzeka"
@@ -12200,5 +12101,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Edycja rzeki"
@@ -12206,15 +12107,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "ląd"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Edycja lądu"
@@ -12222,15 +12123,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "zbiornik wodny"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "sztuczne jezioro"
@@ -12238,15 +12139,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Edycja sztucznego jeziora"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -12254,5 +12155,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr ""
@@ -12261,10 +12162,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "mokradło"
@@ -12275,56 +12176,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Edycja mokradła"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "bagno"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "torfowisko"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
-msgstr ""
-
-#: build/trans_presets.java:1121
+msgstr "marsze"
+
+#: build/trans_presets.java:1107
 msgid "reedbed"
-msgstr ""
-
-#: build/trans_presets.java:1121
+msgstr "szuwary"
+
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
-msgstr ""
-
-#: build/trans_presets.java:1121
+msgstr "tereny zalewowe"
+
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "namorzyny"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "błota"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Edycja błot"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "plaża"
@@ -12332,20 +12233,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Edycja plaży"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "zatoka"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Edycja zatoki"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "klif"
@@ -12353,10 +12254,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Edycja klifu"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "wybrzeże"
@@ -12364,5 +12265,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Edycja zbiornika gazu"
@@ -12370,5 +12271,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "trasa promu"
@@ -12376,5 +12277,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Edycja trasy promu"
@@ -12383,5 +12284,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "stocznia"
@@ -12389,10 +12290,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Edycja stoczni"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "dok"
@@ -12400,5 +12301,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Edycja doku"
@@ -12406,5 +12307,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Tama"
@@ -12412,15 +12313,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Edycja tamy"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Punkty drogi wodnej"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "wrota śluzy"
@@ -12429,5 +12330,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "jaz"
@@ -12435,20 +12336,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Edycja jazu"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "wodospad"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Edycja wodospadu"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr ""
@@ -12457,15 +12358,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "marina"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Edycja mariny"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "molo"
@@ -12473,10 +12374,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Edycja molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "terminal promowy"
@@ -12484,10 +12385,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Edycja terminalu promowego"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "pochylnia"
@@ -12497,5 +12398,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Edycja pochylni"
@@ -12503,10 +12404,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Kolej"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "tor"
@@ -12514,5 +12415,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Edycja toru"
@@ -12542,8 +12443,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Rodzaj (opcjonalne)"
@@ -12557,35 +12458,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "dworzec przetokowy"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "bocznica"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "odnoga"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "kolej wąskotorowa"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edycja toru kolei wąskotorowej"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "tor jednoszynowy"
@@ -12593,45 +12494,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Edycja toru jednoszynowego"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "kolej retro"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Edycja kolei retro"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "trasa szybkiego tramwaju"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Edycja trasy szybkiego tramwaju"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "metro"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Edycja toru metra"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "tramwaj"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Edycja torów tramwajowych"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr ""
@@ -12639,5 +12540,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -12646,14 +12547,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "nieużywany tor"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Edycja opuszczonych torów"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "nieczynny tor"
@@ -12662,5 +12563,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "przejazd kolejowy"
@@ -12669,5 +12570,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "przejazd przez tory"
@@ -12677,11 +12578,11 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
-msgstr ""
+msgstr "Rodzaj przejazdu"
 
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "obrotnica"
@@ -12690,10 +12591,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Koleje linowe"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "wyciąg krzesełkowy"
@@ -12701,10 +12602,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Edycja wyciągu krzesełkowego"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "wyciąg orczykowy"
@@ -12712,10 +12613,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Edycja wyciągu orczykowego"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "kolej linowa"
@@ -12723,24 +12624,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Edycja kolei linowej"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Edycja toru jednoszynowego"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "stacja"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Edycja stacji"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "stacja benzynowa"
@@ -12750,5 +12664,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Edycja stacji benzynowej"
@@ -12764,5 +12678,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12772,5 +12686,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Edycja parkingu"
@@ -12778,40 +12692,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Pojemność"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "powierzchnia"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "wielopoziomowy"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "podziemny"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "parkuj i jedź"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Miejsca dla niepełnosprawnych"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Opłata"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Myjnia samochodowa"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Edycja myjni samochodowej"
@@ -12819,5 +12734,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "warsztat"
@@ -12825,15 +12740,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Edycja warsztatu samochodowego"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr ""
@@ -12841,5 +12756,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "wypożyczalnia"
@@ -12848,10 +12763,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Edycja wypożyczalni samochodów"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr ""
@@ -12859,5 +12774,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr ""
@@ -12865,5 +12780,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Edycja parkingu dla rowerów"
@@ -12872,5 +12787,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Edycja wypożyczalni rowerów"
@@ -12879,15 +12794,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Edycja warsztatu rowerowego"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Transport publiczny"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr ""
@@ -12895,5 +12810,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "przystanek kolejowy"
@@ -12901,5 +12816,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Edycja przystanku kolejowego"
@@ -12907,5 +12822,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "przystanek tramwajowy"
@@ -12914,5 +12829,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Edycja przystanku tramwajowego"
@@ -12920,5 +12835,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr ""
@@ -12927,5 +12842,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr ""
@@ -12937,16 +12852,16 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
-msgstr ""
+msgstr "Oznaczenie (numer toru)"
 
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "obszar"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "wejście do metra"
@@ -12955,10 +12870,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Edycja wejścia do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "dla niepełnosprawnych"
@@ -12967,5 +12882,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "dworzec autobusowa"
@@ -12974,5 +12889,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Edycja dworca autobusowego"
@@ -12980,5 +12895,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Przystanek autobusowy"
@@ -12988,5 +12903,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Edycja przystanku autobusowego"
@@ -12994,10 +12909,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr ""
@@ -13005,5 +12920,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "taksówki"
@@ -13011,5 +12926,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Edycja postoju taksówek"
@@ -13017,5 +12932,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "lotnisko"
@@ -13023,15 +12938,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
-msgstr ""
+msgstr "Edycja lotniska"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13040,5 +12955,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Zakwaterowanie"
@@ -13050,5 +12965,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "hotel"
@@ -13057,15 +12972,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Edycja hotelu"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Gwiazdki"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "motel"
@@ -13073,31 +12988,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Edycja motelu"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "kwatera"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Edycja kwatery turystycznej"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
-msgstr ""
+msgstr "chata górska"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
-msgstr ""
+msgstr "Edycja chaty górskiej"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "hostel"
@@ -13105,30 +13020,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Edycja hostelu"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
-msgstr "alpejska chata"
-
-#. item
-#: build/trans_presets.java:1568
+msgstr "chata alpejska"
+
+#. item
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
-msgstr "Edycja alpejskiej chaty"
+msgstr "Edycja chaty alpejskiej"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "kemping"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Edycja kempingu"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "pole namiotowe"
@@ -13136,10 +13051,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Edycja pola namiotowego"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
@@ -13150,5 +13065,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "restauracja"
@@ -13156,5 +13071,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Edycja restauracji"
@@ -13162,5 +13077,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Kuchnia"
@@ -13168,61 +13083,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "włoska"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "chińska"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "hamburgery"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "grecka"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "niemiecka"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indyjska"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "regionalna"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "turecka"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "azjatycka"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "tajska"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "meksykańska"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japońska"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "fast food"
@@ -13230,9 +13145,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Edycja restauracji fast-food"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "kawiarnia"
@@ -13240,10 +13155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Edycja kawiarni"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "pub"
@@ -13251,31 +13166,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Edycja pubu"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "ogródek piwny"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Edycja ogródka piwnego"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
-msgstr ""
+msgstr "bar"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
-msgstr ""
+msgstr "Edycja baru"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "klub nocny"
@@ -13283,20 +13198,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Edycja klubu nocnego"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Turystyka"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "atrakcja"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Edycja atrakcji turystycznej"
@@ -13305,22 +13220,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "godziny otwarcia"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "muzeum"
@@ -13328,10 +13232,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "Edycja muzeum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "zoo"
@@ -13340,10 +13244,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "Edycja zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "punkt widokowy"
@@ -13351,25 +13255,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr "Edycja punktu widokowego"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
-msgstr ""
+msgstr "wieża widokowa"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr "park rozrywki"
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr "Edycja parku rozrywki"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "sztuka"
@@ -13377,5 +13281,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr "Edycja obiektu sztuki"
@@ -13383,77 +13287,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "mapa"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "mapa miasta"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "mapa tras pieszych"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "mapa tras rowerowych"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
-msgstr ""
+msgstr "Rodzaj tablicy"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr "tablica informacyjna"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "tablica historyczna"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "tablica przyrodnicza"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr "tablica o zwierzętach"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "schronienie"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Edycja schronienia"
@@ -13461,25 +13377,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "miejsce na ognisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "miejsce na piknik"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Edycja miejsca na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "zamek"
@@ -13488,20 +13404,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Edycja zamku"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "ruiny"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Edycja ruin"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Wykopaliska archeologiczne"
@@ -13510,20 +13426,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Edycja wykopalisk archeologicznych"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "pole bitwy"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Edycja pola bitwy"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "pomnik"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -13531,56 +13459,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "pole bitwy"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Edycja pola bitwy"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "plac zabaw"
@@ -13588,15 +13505,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
@@ -13604,15 +13521,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "obiekty sportowe"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "stadion"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -13626,6 +13543,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "wybierz sport:"
@@ -13704,4 +13621,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -13993,28 +13918,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "sport"
@@ -14024,227 +13950,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "różne sporty"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "łucznictwo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "lekkoatletyka"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "siatkówka"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "bule"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "gra w kule"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "kajakarstwo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "wspinaczka"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "krokiet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "kolarstwo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "wyścigi psów"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "jazda konna"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "gimnastyka"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "wyścigi konne"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "sporty motorowe"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "strzelectwo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "jazda na deskorolce"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "łyżwiarstwo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "narciarstwo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "piłka nożna"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "pływanie"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "tenis stołowy"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "boisko"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "miniaturowy golf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Edycja miniaturowego golfa"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr ""
@@ -14283,191 +14209,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "boisko"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "centrum sportowe"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "kręgle"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "wspinaczka"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "kajakarstwo"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "kolarstwo"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "wyścigi psów"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "jeździectwo"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "wyścigi konne"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "gimnastyka"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "sporty motorowe"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "łyżwiarstwo"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "jazda na deskorolce"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "pływanie"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "narciarstwo"
@@ -14475,56 +14401,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:1920
+msgid "Edit Skiing"
+msgstr ""
+
+#. item "Sport/Skiing" text "Name"
 #: build/trans_presets.java:1923
-msgid "Edit Skiing"
-msgstr ""
-
-#. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
 msgid "Piste type"
 msgstr "Rodzaj trasy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "łatwa"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "średnia"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "dla zaawansowanych"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "dla ekspertów"
 
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "strzelectwo"
@@ -14532,178 +14460,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "football"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "australijski football"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "golf"
 
 #. item
+#: build/trans_presets.java:1967
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
 #: build/trans_presets.java:1970
-msgid "Edit Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
 msgid "golf_course"
 msgstr "pole golfowe"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "bule"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "krykiet"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "hokej"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Edycja miejsca do gry w rugby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "tenis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Budynki"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "budynek"
@@ -14711,5 +14639,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -14717,10 +14645,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Edycja budynku użyteczności publicznej"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "ratusz"
@@ -14728,10 +14656,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Edycja ratusza"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "ambasada"
@@ -14739,10 +14667,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Edycja ambasady"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "sąd"
@@ -14751,10 +14679,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Edycja siedziby sądu"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "więzienie"
@@ -14763,10 +14691,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Edycja więzienia"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "posterunek policji"
@@ -14776,10 +14704,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Edycja posterunku policji"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -14788,10 +14716,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Edycja posterunku straży pożarnej"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "poczta"
@@ -14799,5 +14727,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Edycja urzędu pocztowego"
@@ -14805,15 +14733,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "szkoła"
@@ -14821,10 +14749,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Edycja szkoły"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "uniwersytet"
@@ -14832,10 +14760,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Edycja uniwersytetu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "college"
@@ -14843,5 +14771,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Edycja college'u"
@@ -14849,5 +14777,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "kino"
@@ -14856,10 +14784,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Edycja kina"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "biblioteka"
@@ -14868,10 +14796,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Edycja biblioteki"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -14879,10 +14807,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Edycja centrum kulturalnego"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "teatr"
@@ -14891,10 +14819,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Edycja teatru"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -14904,5 +14832,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Edycja miejsca kultu religijnego"
@@ -14911,6 +14839,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Religia"
@@ -14919,66 +14847,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "bahaizm"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "buddyzm"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "chrześcijaństwo"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "hinduizm"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "dżinizm"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "judaizm"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sikhizm"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "spirytualizm"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "taoizm"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "unitarianizm"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "zaratusztrianizm"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Wyznanie"
@@ -14987,81 +14916,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "kościół anglikański"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "baptyści"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "kościół katolicki"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "ewangelikalizm"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "świadkowie Jehowy"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "luteranie"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "metodyści"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "mormoni"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "kościół prawosławny"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "zielonoświątkowcy"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "prezbiterianie"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestanci"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "kwakrzy"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "szyici"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "sunnici"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Adresy"
@@ -15070,5 +14999,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Edycja informacji o adresach"
@@ -15076,5 +15005,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Numer domu"
@@ -15082,20 +15011,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Nazwa domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Nazwa miejscowości"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Kod pocztowy"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Kod kraju"
@@ -15103,5 +15032,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -15110,5 +15039,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Edycja interpolacji adresów"
@@ -15116,67 +15045,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Sposób numeracji domów"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "parzyste"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "nieparzyste"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "wszystkie"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "lekkoatletyka"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "wieża"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -15184,10 +15118,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "wiatrak"
@@ -15195,10 +15129,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -15206,10 +15140,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Edycja rurociągu"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -15219,10 +15153,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "dźwig"
@@ -15230,10 +15164,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Edycja dźwigu"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "radiolatarnia"
@@ -15241,10 +15175,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -15252,10 +15186,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "monitoring"
@@ -15263,5 +15197,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Edycja kamery do monitoringu"
@@ -15269,5 +15203,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "źródło energii elektrycznej"
@@ -15277,39 +15211,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Edycja źródła energii elektrycznej"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "gazowa"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "elektrownia"
@@ -15318,10 +15252,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Edycja elektrowni"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "rozdzielnia elektryczna"
@@ -15330,5 +15264,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Edycja rozdzielni elektrycznej"
@@ -15336,10 +15270,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -15350,5 +15284,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Edycja słupa linii wysokiego napięcia"
@@ -15356,5 +15290,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "linia wysokiego napięcia"
@@ -15363,25 +15297,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Napięcie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Ilość przewodów"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "toalety"
@@ -15389,25 +15323,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Numer referencyjny"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Opłata"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "telefon"
@@ -15416,5 +15345,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Edycja telefonu"
@@ -15422,5 +15351,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "na monety"
@@ -15428,5 +15357,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "na banknoty"
@@ -15434,5 +15363,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "na karty chipowe"
@@ -15440,5 +15369,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "na karty debetowe"
@@ -15446,15 +15375,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -15463,5 +15392,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Edycja punktu zbiórki odpadów"
@@ -15469,35 +15398,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "puszki"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "odzież"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
-msgstr ""
+msgstr "złom"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "ławka"
@@ -15506,20 +15435,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Ambona myśliwska"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr ""
@@ -15527,22 +15456,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "fontanna"
@@ -15551,10 +15480,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -15563,10 +15492,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr ""
@@ -15574,25 +15503,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Sklepy"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "supermarket"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Edycja supermarketu"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "sklepik"
@@ -15600,10 +15529,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Edycja sklepiku"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "kiosk"
@@ -15611,10 +15540,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Edycja kiosku"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "automat sprzedający"
@@ -15622,5 +15551,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Edycja automatu sprzedającego"
@@ -15628,88 +15557,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Sprzedawane produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "bilety komunikacji miejskiej"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "mapy komunikacji miejskiej"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "bilety parkingowe"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "jedzenie"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "napoje"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "słodycze"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "papierosy"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "zdjęcia"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "jedzenie dla zwierząt"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "gazety"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "zabawki"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "znaczki"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "karty SIM"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2396
+msgstr "vouchery"
+
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "prezerwatywy"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tampony"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
-msgstr ""
+msgstr "torby na odchody"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "rzeźnik"
@@ -15717,10 +15646,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Edycja sklepu mięsnego"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "piekarnia"
@@ -15728,10 +15657,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Edycja piekarni"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "florysta"
@@ -15739,70 +15668,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Edycja kwiaciarni"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "naturalna żywność"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Edycja sklepu z naturalną żywnością"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "szkoła"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Edycja sklepu obuwniczego"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "napoje"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Edycja sklepu z napojami"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "komputery"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Edycja sklepu komputerowego"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "elektronika"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Edycja sklepu z elektroniką"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "sprzęt hifi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Edycja sklepu ze sprzętem hi-fi"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "meble"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Edycja sklepu meblowego"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "centrum ogrodnicze"
@@ -15810,10 +15753,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Edycja centrum ogrodniczego"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -15821,10 +15764,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "sklep DIY"
@@ -15832,60 +15775,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 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:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "artykuły biurowe"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Edycja sklepu z artykułami biurowymi"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "fryzjer"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Edycja salonu fryzjerskiego"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "obuwie"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Edycja sklepu obuwniczego"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "zabawki"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Edycja sklepu z zabawkami"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "pralnia chemiczna"
@@ -15893,10 +15836,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Edycja palni chemicznej"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "pralnia samoobsługowa"
@@ -15904,10 +15847,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "wyspa"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "sklep turystyczny"
@@ -15915,35 +15858,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Edycja sklepu ze sprzętem turystycznym"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "Sklep sportowy"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Sport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Edycja sklepu sportowego"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "optyk"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Edycja optyka"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Gotówka"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "bank"
@@ -15951,5 +15896,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Edycja banku"
@@ -15957,10 +15902,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "kantor"
@@ -15968,5 +15913,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Edycja kantoru"
@@ -15974,15 +15919,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Edycja bankomatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Zdrowie"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "lekarz"
@@ -15990,20 +15935,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Edycja lekarza"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "dentysta"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Edycja dentysty"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "apteka"
@@ -16011,5 +15956,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Edycja apteki"
@@ -16017,10 +15962,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "realizacja recept"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "szpital"
@@ -16028,10 +15973,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Edycja szpitala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr ""
@@ -16040,5 +15985,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -16047,26 +15992,26 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Numer telefonu"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
-msgstr "(Proszę podać razem z kodem kraju, np.: +12-345-67890)"
+msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "weterynarz"
@@ -16075,25 +16020,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Edycja lecznicy weterynaryjnej"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "kontynent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "kraj"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Edycja kraju"
@@ -16101,45 +16046,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "stan"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Edycja stanu"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "region"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "okręg"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "miasto"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Edycja miasta"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "miejscowość"
@@ -16147,10 +16093,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Edycja miejscowości"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "dzielnica"
@@ -16158,30 +16104,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Edycja dzielnicy"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "wieś"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "wólka"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "okolica"
@@ -16189,10 +16136,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Edycja okolicy"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "wyspa"
@@ -16200,5 +16147,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Edycja wyspy"
@@ -16206,5 +16153,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "wejście do jaskini"
@@ -16212,10 +16159,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Edycja wejścia do jaskini"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "wzgórze"
@@ -16223,10 +16170,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Edycja wzgórza"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "lodowiec"
@@ -16234,10 +16181,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Edycja lodowca"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "wulkan"
@@ -16245,70 +16192,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Edycja wulkanu"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Granice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "narodowa"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Edycja granicy narodowej"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "administracyjna"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Edycja granicy administracyjnej"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Edycja granicy politycznej"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2728
+msgstr "park narodowy"
+
+#. item
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Edycja granicy parku narodowego"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "drzewo"
@@ -16317,15 +16264,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Edycja drzewa"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Nazwa systematyczna"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "las"
@@ -16334,5 +16281,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Edycja lasu"
@@ -16340,17 +16287,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "iglasty"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "liściasty"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "mieszany"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "las"
@@ -16359,19 +16306,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Edycja lasu"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "rezerwat przyrody"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Edycja rezerwatu przyrody"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "rumowisko"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Edycja rumowiska"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "busz"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Edycja buszu"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "turnia"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Edycja turni"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "wrzosowisko"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Edycja wrzosowiska"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "zagroda"
@@ -16380,70 +16371,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "łąka"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "ogród"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Trawa"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16451,10 +16443,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -16462,20 +16454,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Edycja miejsca publicznego"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "park"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Teren rekreacyjny"
@@ -16483,5 +16475,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edycja terenu rekreacyjnego"
@@ -16489,15 +16481,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -16505,9 +16497,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -16515,39 +16507,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "handel"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "teren kolejowy"
@@ -16555,114 +16547,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "obszar wojskowy"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Edycja obszaru wojskowego"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "budowa"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Edycja terenu budowy"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "teren pod zabudowę"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "budowa"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Edycja terenu budowy"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "wysypisko"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "obszar wojskowy"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Edycja obszaru wojskowego"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "rumowisko"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Edycja rumowiska"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "busz"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Edycja buszu"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "turnia"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Edycja turni"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "wrzosowisko"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Edycja wrzosowiska"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr ""
@@ -16672,5 +16621,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr ""
@@ -16679,10 +16628,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "zewnętrzny segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "wewnętrzny segment"
@@ -16690,5 +16639,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -16697,5 +16646,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Edycja ograniczenia skrętu"
@@ -16703,34 +16652,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "brak skrętu w lewo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "brak skrętu w prawo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -16739,15 +16688,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "do drogi"
@@ -16755,5 +16704,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16762,5 +16711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16768,5 +16717,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -16838,24 +16787,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -16900,4 +16849,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16907,19 +16859,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "objazd"
@@ -16933,37 +16886,37 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
-msgstr ""
+msgstr "Opis symboli"
 
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Sieć"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -16972,30 +16925,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17179,4 +17132,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17188,4 +17248,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17287,11 +17356,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "przestarzały"
@@ -17333,7 +17404,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr ""
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Przeszkody"
 
 #. color tertiary
@@ -17369,6 +17655,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "ulica"
@@ -17424,7 +17710,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr ""
@@ -17471,108 +17757,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr ""
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "Wiadukt"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17589,4 +17788,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "droga serwisowa"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17596,4 +17801,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "bród"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17610,6 +17821,19 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
 msgstr ""
 
@@ -17623,5 +17847,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr ""
@@ -17635,5 +17859,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "strumień"
@@ -17647,5 +17871,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "Dok"
@@ -17673,5 +17897,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "akwedukt"
@@ -17686,4 +17910,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17723,5 +17948,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17838,12 +18063,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr ""
@@ -17889,5 +18115,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17905,7 +18131,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17928,10 +18154,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17961,6 +18187,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -18005,6 +18231,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -18018,5 +18244,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "Terminal"
@@ -18038,5 +18264,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -18050,5 +18276,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -18071,4 +18297,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18088,4 +18322,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr ""
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18094,23 +18334,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr ""
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr ""
@@ -18124,5 +18351,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr ""
@@ -18136,5 +18364,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr ""
@@ -18147,6 +18376,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "dla ekspertów"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18160,5 +18404,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr ""
@@ -18189,4 +18434,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18221,4 +18474,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18231,8 +18508,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr ""
@@ -18245,5 +18524,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr ""
@@ -18257,5 +18539,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr ""
@@ -18383,12 +18665,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr ""
@@ -18402,7 +18684,7 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
-msgstr ""
+msgstr "marina"
 
 #. color leisure
@@ -18472,8 +18754,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18509,4 +18791,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18566,11 +18856,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18709,6 +18999,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18935,22 +19246,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -18982,6 +19293,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -19017,4 +19328,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19034,7 +19353,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr ""
@@ -19128,4 +19448,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19328,4 +19656,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19359,28 +19703,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "sklep"
@@ -19434,4 +19780,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19444,8 +19798,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotel"
@@ -19500,4 +19854,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19594,9 +19949,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr ""
@@ -19668,8 +20023,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr ""
@@ -19739,9 +20094,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr ""
@@ -19755,5 +20110,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "kamieniołom"
@@ -19767,5 +20122,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "Wysypisko smieci"
@@ -19787,5 +20142,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "Basen"
@@ -19799,5 +20154,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "las"
@@ -19811,5 +20166,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -19832,5 +20187,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr ""
@@ -19844,5 +20199,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "Teren przemysłowy"
@@ -19856,5 +20211,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19868,5 +20223,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -19880,5 +20235,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "Teren kolejowy"
@@ -19935,7 +20290,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "Teren wojskowy"
@@ -19949,5 +20304,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "cmentarz"
@@ -19960,5 +20315,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "szczyt"
@@ -19973,5 +20328,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "lodowiec"
@@ -19985,5 +20340,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "wulkan"
@@ -19998,4 +20353,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20037,7 +20393,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr ""
@@ -20051,5 +20408,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr ""
@@ -20063,5 +20420,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr ""
@@ -20075,5 +20432,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "Las naturalny"
@@ -20087,5 +20444,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "błoto"
@@ -20099,5 +20456,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "plaża"
@@ -20175,8 +20532,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr ""
@@ -20224,7 +20581,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "granica"
@@ -20366,10 +20723,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "Miejsce"
@@ -20410,6 +20767,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "adres"
@@ -20691,135 +21055,45 @@
 msgstr ""
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "Jeżeli twoje urządzenie GPS rysuje zbyt mało linii zaznacz tą opcję aby "
-#~ "rysować linie wzdłuż drogi."
-
-#~ msgid "Navigate"
-#~ msgstr "Nawiguj"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Wybierz coś z listy konfliktów."
-
-#~ msgid "Please select a color."
-#~ msgstr "Proszę wybrać kolor."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Nie uruchamiaj w trybie pełnoekranowym"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Wiadomości na temat JOSM"
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Kliknij aby wstawić nowy węzeł i wykonać połączenie."
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr "Zaznacz obiekty, dla których chcesz zmienić właściwości."
-
-#~ msgid "Description:"
-#~ msgstr "Opis:"
-
-#~ msgid "time"
-#~ msgstr "czas"
-
-#~ msgid "desc"
-#~ msgstr "opis"
-
-#~ msgid "symbol"
-#~ msgstr "symbol"
-
-#~ msgid "Tags:"
-#~ msgstr "Etykiety:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "Wybierz kolor ścieżki na podstawie prędkości w punkcie."
-
-#~ msgid "Unknown type"
-#~ msgstr "Nieznany typ"
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Przesyłane: {0} {1} (id: {2}) {3}% {4}/{5} (pozostało {6})..."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Kolej"
-
-#~ msgid "Exit Number"
-#~ msgstr "tor"
-
-#~ msgid "Exit Name"
-#~ msgstr "Nazwa zjazdu"
-
-#~ msgid "Waterway"
-#~ msgstr "Drogi wodne"
-
-#~ msgid "Information point"
-#~ msgstr "informacja turystyczna"
-
-#~ msgid "Provider"
-#~ msgstr "Dostawca"
-
-#~ msgid "political"
-#~ msgstr "polityczna"
-
-#~ msgid "National_park"
-#~ msgstr "granica parku narodowego"
-
-#~ msgid "Natural"
-#~ msgstr "Obiekty naturalne"
-
-#~ msgid "Add Site"
-#~ msgstr "Dodaj witrynę"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Usuń witrynę"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Wybierz proszę witrynę do usunięcia."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Sprawdź stronę/y"
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Dodaj nowe źródło wtyczek."
-
-#~ msgid "Version"
-#~ msgstr "Wersja"
-
-#~ msgid "Install"
-#~ msgstr "Zainstaluj"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Wersja {0} - ostatnia zmiana {1}"
-
-#~ msgid "office"
-#~ msgstr "biuro"
-
-#~ msgid "guidepost"
-#~ msgstr "tabliczki informacyjne"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Adres URL witryny"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Niepoprawny URL"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Pobieranie \"wiadomości dnia\""
-
-#~ msgid "Upload GPX track"
-#~ msgstr "Wyślij ślad GPX"
-
-#~ msgid "Update available"
-#~ msgstr "Dostępna aktualizacja"
-
-#~ msgid "Version Details:"
-#~ msgstr "Informacja o wersji:"
-
-#~ msgid ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
-#~ msgstr ""
-#~ "Zainstalowana: {2}; aktualna: {0}; <font style=\"font-size:x-small\">"
-#~ "(aktualna nieprzetestowana: {1} &#150; nie polecana)</font>"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Otwórz..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Opis"
+
+#~ msgid "Commit comment"
+#~ msgstr "Komentarz zmiany"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Serwer nie wspiera wersjonowania"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Czy na pewno oznaczyć ten problem jako \"załatwiony\"?"
+
+#~ msgid "Navigation"
+#~ msgstr "Nawigacja"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Most zwodzony"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Edycja mostu zwodzonego"
+
+#~ msgid "Portcullis"
+#~ msgstr "brona"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Edycja brony"
+
+#~ msgid "Charge"
+#~ msgstr "Opłata"
+
+#~ msgid "sports"
+#~ msgstr "Sklep sportowy"
+
+#~ msgid "viaduct"
+#~ msgstr "Wiadukt"
Index: /applications/editors/josm/i18n/po/ro.po
===================================================================
--- /applications/editors/josm/i18n/po/ro.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/ro.po	(revision 14844)
@@ -8,7 +8,7 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-24 16:46+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-05 12:42+0000\n"
+"Last-Translator: Nostriel <nostriel@gmail.com>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\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-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -24,5 +24,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr ""
@@ -38,7 +38,7 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:258
 msgid "The projection could not be read from preferences. Using EPSG:4326"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+msgstr "Proiecţia nu a putut fi citită din preferinţe. Folosesc EPSG:4326"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -46,34 +46,34 @@
 "server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Modificări nesalvate"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+msgstr "Exista modificări nesalvate. Renunţ la modificări şi continui?"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+msgstr "Salvez şi Ies"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+msgstr "Renunţ şi Ies"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -84,10 +84,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -98,4 +98,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -105,10 +106,10 @@
 msgstr "Renunţă"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -134,8 +135,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -276,5 +277,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -408,6 +409,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -415,20 +416,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -528,5 +529,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -643,6 +644,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -651,6 +652,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -773,9 +774,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1047,5 +1048,5 @@
 msgstr "Salvează datele curente."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1053,26 +1054,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Nu este nici un document deschis, nu este nimic de salvat."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Document gol"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Conflicte"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1082,32 +1083,32 @@
 "ca şi cum aţi refuzat totul. Continui?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Extensie fişier necunoscută."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1161,18 +1162,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1180,5 +1181,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1190,9 +1191,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1200,10 +1201,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1211,5 +1212,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1217,5 +1218,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1361,46 +1362,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Despre JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Trimite toate schimbările la serverul OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Obiecte de adăugat:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Obiecte de modificat:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Obiecte de şters:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Nimic de transmis. Mai întâi obţineţi nişte date."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Există conflicte nerezolvate. Mai întâi trebuie să le rezolvaţi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Nu sunt schimbări de transmis."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Transmit datele"
@@ -1583,31 +1588,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Adaugă nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr ""
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1616,9 +1623,4 @@
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2021,5 +2023,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2213,5 +2215,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr ""
@@ -2233,127 +2235,127 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr ""
@@ -2361,5 +2363,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2388,5 +2390,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "fundal"
@@ -2443,5 +2445,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2455,5 +2457,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2484,14 +2486,14 @@
 msgstr "rezolvat în versiunea:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -2557,71 +2559,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Nume utilizator"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Parolă"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "utilizare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "opţiuni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Arată acest ajutor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Argument geometrie unix standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Descarcă perimetrul selectat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Selectează cu căutarea dată"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Restabileşte preferinţele implicite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "exemple"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2632,22 +2634,27 @@
 "că aţi încărcat date înainte de --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "În loc de --download=<bbox> puteţi specifica osm://<bbox>\n"
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+msgid "Activating updated plugins"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
-msgid "Activating updated plugins"
+msgid "Loading early plugins"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
-msgid "Loading early plugins"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr ""
 
@@ -2826,5 +2833,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3040,5 +3047,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr ""
@@ -3086,73 +3093,71 @@
 msgstr ""
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3161,36 +3166,36 @@
 msgstr "Elimină"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Au existat conflicte în timpul importului."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr ""
@@ -3204,10 +3209,11 @@
 msgstr ""
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr ""
@@ -3396,5 +3402,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr ""
@@ -3441,21 +3447,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr ""
@@ -3506,10 +3512,7 @@
 msgstr ""
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr ""
@@ -3664,4 +3667,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3765,5 +3769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3820,19 +3824,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Java Versiunea {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} constă în:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} şters.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "utilizare"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Java Versiunea {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3840,21 +3859,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4279,5 +4298,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4362,4 +4381,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4443,7 +4464,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4456,7 +4474,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4472,10 +4497,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4644,5 +4669,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4676,7 +4703,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4760,4 +4787,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4810,4 +4845,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4816,7 +4857,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4825,15 +4863,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4858,129 +4885,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Nume"
@@ -5033,7 +5062,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "nici unul"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5060,45 +5088,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr ""
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr ""
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5106,25 +5124,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr ""
@@ -5172,7 +5195,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Trasează linii între puncte gps neprelucrate"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5777,10 +5799,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Pregătesc datele..."
@@ -5790,25 +5812,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Nu sunt schimbări de transmis."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+msgid "Error processing changeset upload response"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Gazdă necunoscută"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Parolă sau nume utilizator incorecte."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Atenţie: Parola este transferată necriptată."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Salvează nume utilizator şi parolă (necriptate)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Introduceţi parola"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5819,44 +5890,52 @@
 msgstr "Eroare la prelucrare."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Versiune necunoscută"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Versiune necunoscută"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Obiect ilegal cu id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr ""
@@ -5866,10 +5945,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5877,54 +5956,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Gazdă necunoscută"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
 msgstr ""
 
@@ -6080,6 +6112,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "necunoscut"
@@ -6283,5 +6315,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr ""
@@ -7515,7 +7547,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr ""
@@ -7808,5 +7840,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -7823,4 +7855,11 @@
 msgstr ""
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr ""
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7846,34 +7885,37 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
 msgstr ""
 
@@ -7903,5 +7945,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -7909,9 +7951,9 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr ""
@@ -7979,40 +8021,34 @@
 msgstr ""
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr ""
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
-#, fuzzy
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 msgid "Routing"
-msgstr "şir"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-msgid "Click to add route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-msgid "Click and drag to move route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-msgid "Remove route nodes"
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
+msgid "Click to add destination."
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "Deschide o listă cu toate straturile încărcate."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-msgid "Start routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+msgid "Add routing layer"
 msgstr ""
 
@@ -8025,14 +8061,13 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Anulează"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
 msgstr ""
@@ -8062,33 +8097,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr ""
@@ -8111,34 +8146,34 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr ""
@@ -8153,5 +8188,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8206,7 +8241,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Editare"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8221,7 +8255,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "nici unul"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
@@ -8233,5 +8266,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8239,7 +8272,6 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -8247,5 +8279,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -8259,7 +8290,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Căutare"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
@@ -8270,7 +8300,6 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "strat"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8354,5 +8383,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr ""
@@ -8472,12 +8501,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Îmbin conflictele."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "elimină din selecţie"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -9074,4 +9101,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9153,7 +9186,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr ""
@@ -9167,5 +9200,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr ""
@@ -9437,4 +9470,9 @@
 msgstr ""
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9551,21 +9589,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9574,15 +9619,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9592,15 +9637,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9609,5 +9654,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9616,5 +9661,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9623,5 +9668,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9711,5 +9756,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr ""
@@ -9764,7 +9809,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Strat"
@@ -9807,5 +9852,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -9853,5 +9898,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr ""
@@ -9907,5 +9952,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -9955,5 +10000,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr ""
@@ -10000,5 +10045,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr ""
@@ -10045,5 +10090,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr ""
@@ -10201,6 +10246,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr ""
@@ -10249,5 +10294,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr ""
@@ -10279,5 +10324,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr ""
@@ -10288,5 +10333,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr ""
@@ -10300,5 +10345,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr ""
@@ -10450,5 +10495,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10469,6 +10514,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr ""
@@ -10612,7 +10657,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr ""
@@ -10626,73 +10671,63 @@
 msgstr ""
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr ""
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr ""
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr ""
@@ -10767,130 +10802,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr ""
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10898,5 +10821,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10904,11 +10827,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10916,5 +10833,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10922,5 +10839,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10928,5 +10845,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10934,6 +10851,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -10952,6 +10875,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr ""
@@ -10977,6 +10900,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr ""
@@ -11002,6 +10925,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr ""
@@ -11027,6 +10950,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr ""
@@ -11040,5 +10963,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr ""
@@ -11056,5 +10979,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr ""
@@ -11072,5 +10995,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr ""
@@ -11097,6 +11020,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr ""
@@ -11137,6 +11060,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11147,5 +11069,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr ""
@@ -11489,14 +11411,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr ""
@@ -11521,20 +11443,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11542,5 +11464,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11549,5 +11471,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11557,5 +11479,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11704,10 +11626,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr ""
@@ -11720,29 +11643,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr ""
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11751,7 +11663,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11760,69 +11675,54 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr ""
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr ""
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
 #: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr ""
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr ""
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
 msgid "Bus Trap"
 msgstr ""
@@ -11830,84 +11730,40 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr ""
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
 #: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr ""
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr ""
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr ""
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr ""
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr ""
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
-msgid "Sally Port"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:946
-msgid "Edit Sally Port"
-msgstr ""
-
-#. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
+msgid "Border Control"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr ""
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
 msgid "Hedge"
 msgstr ""
@@ -11916,5 +11772,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
+#: build/trans_presets.java:905
 msgid "Fence"
 msgstr ""
@@ -11923,11 +11779,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
+#: build/trans_presets.java:909
 msgid "Wall"
 msgstr ""
@@ -11935,5 +11785,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
+#: build/trans_presets.java:912
 msgid "City Wall"
 msgstr ""
@@ -11942,5 +11792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
+#: build/trans_presets.java:916
 msgid "Retaining Wall"
 msgstr ""
@@ -11949,46 +11799,99 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
 #. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr ""
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr ""
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr ""
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
 #: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr ""
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr ""
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr ""
-
-#. item "Barriers/Entrance" check "Motorcar"
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
+msgid "Sally Port"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1004
+msgid "Edit Sally Port"
+msgstr ""
+
+#. item "Barriers/Sally Port" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr ""
@@ -11996,5 +11899,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr ""
@@ -12002,5 +11905,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr ""
@@ -12008,32 +11911,32 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
+#: build/trans_presets.java:1028
+msgid "Edit Drain"
+msgstr ""
+
+#. item "Water/Drain" combo "Layer"
+#: build/trans_presets.java:1034
+msgid "Stream"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
+#: build/trans_presets.java:1036
+msgid "Edit Stream"
+msgstr ""
+
+#. item "Water/Stream" combo "Layer"
 #: build/trans_presets.java:1042
-msgid "Edit Drain"
-msgstr ""
-
-#. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
-msgid "Stream"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
+msgid "Canal"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
+#: build/trans_presets.java:1044
+msgid "Edit Canal"
+msgstr ""
+
+#. item "Water/Canal" combo "Layer"
 #: build/trans_presets.java:1050
-msgid "Edit Stream"
-msgstr ""
-
-#. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
-msgid "Canal"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
-msgid "Edit Canal"
-msgstr ""
-
-#. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
 msgid "River"
 msgstr ""
@@ -12043,21 +11946,21 @@
 #. 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:1054
+msgid "Edit River"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
+#: build/trans_presets.java:1063
+msgid "Edit Water"
+msgstr ""
+
+#. item "Water/Water" text "Name"
+#: build/trans_presets.java:1067
+msgid "Land"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1068
-msgid "Edit River"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
-msgid "Edit Water"
-msgstr ""
-
-#. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
-msgid "Land"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1082
 msgid "Edit Land"
 msgstr ""
@@ -12065,31 +11968,31 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1073
+msgid "Basin"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1074
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Basin" text "Name"
+#: build/trans_presets.java:1079
+msgid "Reservoir"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1081
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Reservoir" text "Name"
+#: build/trans_presets.java:1086
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1087
-msgid "Basin"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1088
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
-msgid "Reservoir"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1101
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -12097,5 +12000,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr ""
@@ -12104,10 +12007,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr ""
@@ -12118,77 +12021,77 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
+#: build/trans_presets.java:1107
+msgid "swamp"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "bog"
+msgstr ""
+
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_presets.java:1107 build/trans_style.java:3326
+msgid "marsh"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "reedbed"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "saltmarsh"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "tidalflat"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "mangrove"
+msgstr ""
+
+#: build/trans_presets.java:1109
+msgid "Mud"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1110
+msgid "Edit Mud"
+msgstr ""
+
+#. item "Water/Mud" text "Name"
+#: build/trans_presets.java:1114
+msgid "Beach"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
+#: build/trans_presets.java:1116
+msgid "Edit Beach"
+msgstr ""
+
+#. item "Water/Beach" text "Name"
+#: build/trans_presets.java:1120
+msgid "Bay"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1121
-msgid "swamp"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "bog"
-msgstr ""
-
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
-msgid "marsh"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "reedbed"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "saltmarsh"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "tidalflat"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "mangrove"
-msgstr ""
-
-#: build/trans_presets.java:1123
-msgid "Mud"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1124
-msgid "Edit Mud"
-msgstr ""
-
-#. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
-msgid "Beach"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
-msgid "Edit Beach"
-msgstr ""
-
-#. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
-msgid "Bay"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1135
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr ""
@@ -12196,10 +12099,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr ""
@@ -12207,5 +12110,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr ""
@@ -12213,5 +12116,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr ""
@@ -12219,5 +12122,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr ""
@@ -12226,5 +12129,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr ""
@@ -12232,10 +12135,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr ""
@@ -12243,5 +12146,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr ""
@@ -12249,5 +12152,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr ""
@@ -12255,15 +12158,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr ""
@@ -12272,5 +12175,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr ""
@@ -12278,20 +12181,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr ""
@@ -12300,15 +12203,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr ""
@@ -12316,10 +12219,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr ""
@@ -12327,10 +12230,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr ""
@@ -12340,5 +12243,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr ""
@@ -12346,10 +12249,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr ""
@@ -12357,5 +12260,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr ""
@@ -12385,8 +12288,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr ""
@@ -12400,87 +12303,87 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr ""
 
+#: build/trans_presets.java:1228
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1229
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#: build/trans_presets.java:1234
+msgid "Monorail"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1236
+msgid "Edit Monorail"
+msgstr ""
+
+#: build/trans_presets.java:1241
+msgid "Preserved"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1242
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1243
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#: build/trans_presets.java:1247
+msgid "Light Rail"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1248
-msgid "Monorail"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1255
-msgid "Preserved"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1256
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1261
-msgid "Light Rail"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1262
 msgid "Edit Light Rail"
 msgstr ""
 
+#: build/trans_presets.java:1253
+msgid "Subway"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1254
+msgid "Edit Subway"
+msgstr ""
+
+#: build/trans_presets.java:1259
+msgid "Tram"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1260
+msgid "Edit Tram"
+msgstr ""
+
+#: build/trans_presets.java:1265
+msgid "Bus Guideway"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
 #: build/trans_presets.java:1267
-msgid "Subway"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1268
-msgid "Edit Subway"
-msgstr ""
-
-#: build/trans_presets.java:1273
-msgid "Tram"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1274
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1279
-msgid "Bus Guideway"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -12489,14 +12392,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr ""
@@ -12505,5 +12408,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr ""
@@ -12512,5 +12415,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr ""
@@ -12520,5 +12423,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12526,5 +12429,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr ""
@@ -12533,57 +12436,69 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
+#: build/trans_presets.java:1314
+msgid "Chair Lift"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
+#: build/trans_presets.java:1316
+msgid "Edit Chair Lift"
+msgstr ""
+
+#. item "Aerialway/Chair Lift" text "Name"
+#: build/trans_presets.java:1320
+msgid "Drag Lift"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
+#: build/trans_presets.java:1322
+msgid "Edit Drag Lift"
+msgstr ""
+
+#. item "Aerialway/Drag Lift" text "Name"
+#: build/trans_presets.java:1326
+msgid "Cable Car"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
 #: build/trans_presets.java:1328
-msgid "Chair Lift"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
-msgid "Edit Chair Lift"
-msgstr ""
-
-#. item "Aerialway/Chair Lift" text "Name"
+msgid "Edit Cable Car"
+msgstr ""
+
+#. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
 #: build/trans_presets.java:1334
-msgid "Drag Lift"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
-msgid "Edit Drag Lift"
-msgstr ""
-
-#. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
-msgid "Cable Car"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
-msgid "Edit Cable Car"
-msgstr ""
-
-#. item "Aerialway/Cable Car" text "Name"
+msgid "Edit Gondola"
+msgstr ""
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr ""
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr ""
@@ -12593,5 +12508,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr ""
@@ -12607,5 +12522,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12615,5 +12530,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr ""
@@ -12621,40 +12536,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr ""
@@ -12662,5 +12578,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr ""
@@ -12668,15 +12584,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr ""
@@ -12684,5 +12600,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr ""
@@ -12691,16 +12607,16 @@
 #. <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:1389
+msgid "Edit Car Rental"
+msgstr ""
+
+#. item "Car/Rental" text "Operator"
+#: build/trans_presets.java:1394
+msgid "Sharing"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
 #: build/trans_presets.java:1396
-msgid "Edit Car Rental"
-msgstr ""
-
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
-msgid "Sharing"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
 msgid "Edit Car Sharing"
 msgstr ""
@@ -12708,5 +12624,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -12715,5 +12631,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr ""
@@ -12722,15 +12638,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr ""
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr ""
@@ -12738,5 +12654,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr ""
@@ -12744,5 +12660,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr ""
@@ -12750,5 +12666,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr ""
@@ -12757,5 +12673,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr ""
@@ -12763,5 +12679,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr ""
@@ -12770,5 +12686,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr ""
@@ -12780,5 +12696,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr ""
@@ -12786,10 +12702,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr ""
@@ -12798,10 +12714,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr ""
@@ -12810,5 +12726,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr ""
@@ -12817,5 +12733,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr ""
@@ -12823,5 +12739,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr ""
@@ -12831,5 +12747,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr ""
@@ -12837,10 +12753,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr ""
@@ -12848,5 +12764,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr ""
@@ -12854,5 +12770,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr ""
@@ -12860,21 +12776,21 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1515
+msgid "Airport"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
+#: build/trans_presets.java:1517
+msgid "Edit Airport"
+msgstr ""
+
+#. item "Public Transport/Airport" text "Reference"
 #: build/trans_presets.java:1522
-msgid "Airport"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr ""
@@ -12883,5 +12799,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr ""
@@ -12893,5 +12809,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -12900,89 +12816,89 @@
 #. <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:1532
+msgid "Edit Hotel"
+msgstr ""
+
+#. item "Accomodation/Hotel" text "Name"
+#: build/trans_presets.java:1535
+msgid "Stars"
+msgstr ""
+
+#. item "Accomodation/Hotel" combo "Stars"
+#: build/trans_presets.java:1537
+msgid "Motel"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #: build/trans_presets.java:1539
-msgid "Edit Hotel"
-msgstr ""
-
-#. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
-msgid "Stars"
-msgstr ""
-
-#. item "Accomodation/Hotel" combo "Stars"
+msgid "Edit Motel"
+msgstr ""
+
+#. item "Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1543
+msgid "Guest House"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1544
-msgid "Motel"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
-msgid "Edit Motel"
-msgstr ""
-
-#. item "Accomodation/Motel" text "Name"
+msgid "Edit Guest House"
+msgstr ""
+
+#. item "Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1548
+msgid "Chalet"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #: build/trans_presets.java:1550
-msgid "Guest House"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1551
-msgid "Edit Guest House"
-msgstr ""
-
-#. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
-msgid "Chalet"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
+#: build/trans_presets.java:1554
+msgid "Hostel"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
+#: build/trans_presets.java:1556
+msgid "Edit Hostel"
+msgstr ""
+
+#. item "Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1560
+msgid "Alpine Hut"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1561
-msgid "Hostel"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
-msgid "Edit Hostel"
-msgstr ""
-
-#. item "Accomodation/Hostel" text "Name"
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1566
+msgid "Caravan Site"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1567
-msgid "Alpine Hut"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1568
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Accomodation/Alpine Hut" text "Elevation"
+msgid "Edit Caravan Site"
+msgstr ""
+
+#. item "Accomodation/Caravan Site" text "Name"
+#: build/trans_presets.java:1571
+msgid "Camping Site"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #: build/trans_presets.java:1573
-msgid "Caravan Site"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1574
-msgid "Edit Caravan Site"
-msgstr ""
-
-#. item "Accomodation/Caravan Site" text "Name"
+msgid "Edit Camping Site"
+msgstr ""
+
+#. item "Accomodation/Camping Site" text "Name"
 #: build/trans_presets.java:1578
-msgid "Camping Site"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
-msgid "Edit Camping Site"
-msgstr ""
-
-#. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
 msgid "Food+Drinks"
 msgstr ""
@@ -12993,5 +12909,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -12999,5 +12915,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr ""
@@ -13005,5 +12921,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr ""
@@ -13011,135 +12927,135 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr ""
 
+#: build/trans_presets.java:1586
+msgid "Fast Food"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
+#: build/trans_presets.java:1588
+msgid "Edit Fast Food Restaurant"
+msgstr ""
+
 #: build/trans_presets.java:1593
-msgid "Fast Food"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
+msgid "Cafe"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #: build/trans_presets.java:1595
-msgid "Edit Fast Food Restaurant"
-msgstr ""
-
-#: build/trans_presets.java:1600
-msgid "Cafe"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
 msgid "Edit Cafe"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Name"
+#: build/trans_presets.java:1599
+msgid "Pub"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
+#: build/trans_presets.java:1601
+msgid "Edit Pub"
+msgstr ""
+
+#. item "Food+Drinks/Pub" text "Name"
+#: build/trans_presets.java:1605
+msgid "Biergarten"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1606
-msgid "Pub"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
-msgid "Edit Pub"
-msgstr ""
-
-#. item "Food+Drinks/Pub" text "Name"
+msgid "Edit Biergarten"
+msgstr ""
+
+#. item "Food+Drinks/Biergarten" text "Name"
+#: build/trans_presets.java:1610
+msgid "Bar"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #: build/trans_presets.java:1612
-msgid "Biergarten"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1613
-msgid "Edit Biergarten"
-msgstr ""
-
-#. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
-msgid "Bar"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
+#: build/trans_presets.java:1616
+msgid "Nightclub"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
+#: build/trans_presets.java:1618
+msgid "Edit Nightclub"
+msgstr ""
+
+#. item "Food+Drinks/Nightclub" text "Name"
 #: build/trans_presets.java:1623
-msgid "Nightclub"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
+msgid "Tourism"
+msgstr ""
+
+#. group "Tourism"
+#: build/trans_presets.java:1624
+msgid "Attraction"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1625
-msgid "Edit Nightclub"
-msgstr ""
-
-#. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
-msgid "Tourism"
-msgstr ""
-
-#. group "Tourism"
-#: build/trans_presets.java:1631
-msgid "Attraction"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1632
 msgid "Edit Attraction"
 msgstr ""
@@ -13148,22 +13064,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr ""
@@ -13171,10 +13076,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr ""
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr ""
@@ -13183,10 +13088,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr ""
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr ""
@@ -13194,25 +13099,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr ""
@@ -13220,5 +13125,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr ""
@@ -13226,77 +13131,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
+msgstr ""
+
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr ""
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr ""
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr ""
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr ""
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr ""
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr ""
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr ""
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr ""
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr ""
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr ""
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr ""
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr ""
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr ""
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr ""
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr ""
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr ""
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr ""
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr ""
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr ""
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr ""
@@ -13304,25 +13221,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr ""
@@ -13331,20 +13248,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:1715
+msgid "Edit Castle"
+msgstr ""
+
+#. item "Historic Places/Castle" text "Name"
 #: build/trans_presets.java:1719
-msgid "Edit Castle"
-msgstr ""
-
-#. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
 msgid "Ruins"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:1720
+msgid "Edit Ruins"
+msgstr ""
+
+#. item "Historic Places/Ruins" text "Name"
 #: build/trans_presets.java:1724
-msgid "Edit Ruins"
-msgstr ""
-
-#. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
 msgid "Archaeological Site"
 msgstr ""
@@ -13353,20 +13270,32 @@
 #. <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:1727
+msgid "Edit Archaeological Site"
+msgstr ""
+
+#. item "Historic Places/Archaeological Site" text "Name"
 #: build/trans_presets.java:1731
-msgid "Edit Archaeological Site"
-msgstr ""
-
-#. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+msgid "Battlefield"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr ""
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr ""
@@ -13374,56 +13303,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr ""
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr ""
@@ -13431,15 +13349,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr ""
@@ -13447,15 +13365,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr ""
@@ -13469,6 +13387,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr ""
@@ -13547,4 +13465,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -13836,28 +13762,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr ""
@@ -13867,227 +13794,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr ""
@@ -14126,191 +14053,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr ""
@@ -14318,56 +14245,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:1920
+msgid "Edit Skiing"
+msgstr ""
+
+#. item "Sport/Skiing" text "Name"
 #: build/trans_presets.java:1923
-msgid "Edit Skiing"
-msgstr ""
-
-#. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
+#: build/trans_presets.java:1924
+msgid "Difficulty"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:1924
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "advanced"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "Difficulty"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
-msgid "novice"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "easy"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "intermedia"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "advance"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr ""
@@ -14375,184 +14302,184 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:1967
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
 #: build/trans_presets.java:1970
-msgid "Edit Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf" combo "type"
+msgid "golf_course"
+msgstr ""
+
+#: build/trans_presets.java:1972
+msgid "Boule"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1973
-msgid "golf_course"
-msgstr ""
-
-#: build/trans_presets.java:1975
-msgid "Boule"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1976
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr ""
 
 #. group "Buildings"
+#: build/trans_presets.java:2041
+msgid "Building"
+msgstr ""
+
+#. item
+#. <key key="building" value="yes" />
 #: build/trans_presets.java:2044
-msgid "Building"
-msgstr ""
-
-#. item
-#. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
 msgid "Public Building"
 msgstr ""
@@ -14560,10 +14487,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr ""
@@ -14571,10 +14498,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr ""
@@ -14582,10 +14509,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr ""
@@ -14594,10 +14521,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr ""
@@ -14606,10 +14533,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr ""
@@ -14619,10 +14546,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr ""
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr ""
@@ -14631,10 +14558,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr ""
@@ -14642,5 +14569,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr ""
@@ -14648,15 +14575,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr ""
@@ -14664,10 +14591,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr ""
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr ""
@@ -14675,10 +14602,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr ""
@@ -14686,5 +14613,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr ""
@@ -14692,5 +14619,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr ""
@@ -14699,10 +14626,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr ""
@@ -14711,10 +14638,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr ""
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr ""
@@ -14722,10 +14649,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr ""
@@ -14734,10 +14661,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr ""
@@ -14747,5 +14674,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr ""
@@ -14754,6 +14681,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr ""
@@ -14762,66 +14689,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr ""
@@ -14830,81 +14757,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr ""
@@ -14913,5 +14840,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr ""
@@ -14919,5 +14846,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr ""
@@ -14925,20 +14852,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
+#: build/trans_presets.java:2167
+msgid "House name"
+msgstr ""
+
+#. item "Buildings/Addresses" text "Street name"
+#: build/trans_presets.java:2169
+msgid "City name"
+msgstr ""
+
+#. item "Buildings/Addresses" text "City name"
 #: build/trans_presets.java:2170
-msgid "House name"
-msgstr ""
-
-#. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
-msgid "City name"
-msgstr ""
-
-#. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
 msgid "Post code"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr ""
@@ -14946,5 +14873,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr ""
@@ -14953,5 +14880,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -14959,67 +14886,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
+#: build/trans_presets.java:2179
+msgid "Numbering scheme"
+msgstr ""
+
+#. item "Buildings/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:2179
+msgid "odd"
+msgstr ""
+
+#: build/trans_presets.java:2179
+msgid "even"
+msgstr ""
+
+#: build/trans_presets.java:2179
+msgid "all"
+msgstr ""
+
+#: build/trans_presets.java:2179
+msgid "alphabetic"
+msgstr ""
+
 #: build/trans_presets.java:2182
-msgid "Numbering scheme"
-msgstr ""
-
-#. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
-msgid "odd"
-msgstr ""
-
-#: build/trans_presets.java:2182
-msgid "even"
-msgstr ""
-
-#: build/trans_presets.java:2182
-msgid "all"
-msgstr ""
-
-#: build/trans_presets.java:2185
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr ""
@@ -15027,10 +14958,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr ""
@@ -15038,10 +14969,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr ""
@@ -15049,10 +14980,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr ""
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr ""
@@ -15062,10 +14993,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr ""
@@ -15073,10 +15004,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr ""
@@ -15084,10 +15015,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr ""
@@ -15095,10 +15026,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr ""
@@ -15106,5 +15037,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -15112,5 +15043,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr ""
@@ -15120,39 +15051,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
+#: build/trans_presets.java:2260
+msgid "wind"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "hydro"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "fossil"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "nuclear"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "coal"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "photovoltaic"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "gas"
+msgstr ""
+
+#. item "Man Made/Power Generator" text "Name"
 #: build/trans_presets.java:2263
-msgid "wind"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "hydro"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "fossil"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "nuclear"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "coal"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "photovoltaic"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "gas"
-msgstr ""
-
-#. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
 msgid "Power Station"
 msgstr ""
@@ -15161,10 +15092,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr ""
@@ -15173,5 +15104,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -15179,10 +15110,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr ""
@@ -15193,5 +15124,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr ""
@@ -15199,5 +15130,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr ""
@@ -15206,25 +15137,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
+#: build/trans_presets.java:2294
+msgid "Amount of Wires"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Amount of Wires"
 #: build/trans_presets.java:2297
-msgid "Amount of Wires"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr ""
@@ -15232,25 +15163,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr ""
 
-#. item "Amenities/Toilets" text "Reference number"
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
+msgid "Note"
+msgstr ""
+
+#. item "Amenities/Toilets" text "Note"
 #: build/trans_presets.java:2307
-msgid "Charge"
-msgstr ""
-
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
-msgid "Note"
-msgstr ""
-
-#. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr ""
@@ -15259,5 +15185,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr ""
@@ -15265,5 +15191,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr ""
@@ -15271,5 +15197,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr ""
@@ -15277,5 +15203,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -15283,5 +15209,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr ""
@@ -15289,15 +15215,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr ""
@@ -15306,5 +15232,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr ""
@@ -15312,35 +15238,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2330
+msgid "Batteries"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2331
+msgid "Cans"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2332
+msgid "Clothes"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Clothes"
 #: build/trans_presets.java:2333
-msgid "Batteries"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Batteries"
+msgid "Glass"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Glass"
 #: build/trans_presets.java:2334
-msgid "Cans"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Cans"
+msgid "Paper"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Paper"
 #: build/trans_presets.java:2335
-msgid "Clothes"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
-msgid "Glass"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Glass"
+msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
 #: build/trans_presets.java:2337
-msgid "Paper"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
-msgid "Scrap Metal"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
 msgid "Bench"
 msgstr ""
@@ -15349,20 +15275,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:2342
+msgid "Edit Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand" check "Shelter"
 #: build/trans_presets.java:2345
-msgid "Edit Hunting Stand"
-msgstr ""
-
-#. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr ""
@@ -15370,22 +15296,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr ""
@@ -15394,10 +15320,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr ""
@@ -15406,10 +15332,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr ""
@@ -15417,25 +15343,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr ""
@@ -15443,10 +15369,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr ""
@@ -15454,10 +15380,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr ""
@@ -15465,5 +15391,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr ""
@@ -15471,88 +15397,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr ""
@@ -15560,10 +15486,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr ""
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr ""
@@ -15571,10 +15497,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr ""
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr ""
@@ -15582,70 +15508,81 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+msgid "Alcohol"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr ""
@@ -15653,10 +15590,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -15664,10 +15601,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -15675,60 +15612,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr ""
@@ -15736,10 +15673,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr ""
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr ""
@@ -15747,10 +15684,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr ""
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr ""
@@ -15758,35 +15695,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+msgid "Sports"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr ""
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2522
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+msgid "Optician"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr ""
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr ""
@@ -15794,5 +15731,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr ""
@@ -15800,10 +15737,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr ""
@@ -15811,5 +15748,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr ""
@@ -15817,15 +15754,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr ""
@@ -15833,20 +15770,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr ""
@@ -15854,5 +15791,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr ""
@@ -15860,10 +15797,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr ""
@@ -15871,10 +15808,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr ""
@@ -15883,5 +15820,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -15890,20 +15827,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -15911,5 +15848,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr ""
@@ -15918,25 +15855,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr ""
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr ""
@@ -15944,45 +15881,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr ""
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr ""
@@ -15990,10 +15928,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr ""
@@ -16001,30 +15939,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr ""
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr ""
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr ""
@@ -16032,10 +15971,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr ""
@@ -16043,5 +15982,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr ""
@@ -16049,5 +15988,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr ""
@@ -16055,10 +15994,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr ""
@@ -16066,10 +16005,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr ""
@@ -16077,10 +16016,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr ""
@@ -16088,70 +16027,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr ""
@@ -16160,15 +16099,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr ""
@@ -16177,5 +16116,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr ""
@@ -16183,17 +16122,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr ""
@@ -16202,19 +16141,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr ""
@@ -16223,70 +16206,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr ""
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16294,10 +16278,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr ""
@@ -16305,20 +16289,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr ""
@@ -16326,5 +16310,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -16332,15 +16316,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr ""
@@ -16348,9 +16332,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr ""
@@ -16358,39 +16342,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr ""
@@ -16398,66 +16382,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2885
-msgid "Brownfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2886
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
-msgid "Greenfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2892
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr ""
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
-msgid "Landfill"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2904
-msgid "Edit Landfill Landuse"
-msgstr ""
-
-#. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
-msgid "Quarry"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2910
-msgid "Edit Quarry Landuse"
-msgstr ""
-
-#. item "Land use/Quarry" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:2915
-msgid "Military"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2916
 msgid "Edit Military Landuse"
 msgstr ""
@@ -16465,47 +16398,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:2922
-msgid "Scree"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
+msgid "Edit Construction Landuse"
+msgstr ""
+
+#. item "Land use/Construction area" text "Name"
 #: build/trans_presets.java:2927
-msgid "Scrub"
+msgid "Brownfield"
 msgstr ""
 
 #. item
 #: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:2933
+msgid "Greenfield"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:2939
+msgid "Landfill"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:2940
-msgid "Edit Heath"
+msgid "Edit Landfill Landuse"
+msgstr ""
+
+#. item "Land use/Landfill" text "Name"
+#: build/trans_presets.java:2945
+msgid "Quarry"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2946
+msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr ""
@@ -16515,5 +16456,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr ""
@@ -16522,10 +16463,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr ""
@@ -16533,5 +16474,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr ""
@@ -16540,5 +16481,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -16546,34 +16487,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr ""
@@ -16582,15 +16523,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr ""
@@ -16598,5 +16539,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16605,5 +16546,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16611,5 +16552,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -16681,24 +16622,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -16743,4 +16684,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16750,19 +16694,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -16776,10 +16721,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -16787,26 +16732,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr ""
@@ -16815,30 +16760,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17022,4 +16967,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17031,4 +17083,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17130,11 +17191,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr ""
@@ -17176,6 +17239,220 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
+msgstr ""
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+msgid "barrier"
 msgstr ""
 
@@ -17212,6 +17489,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr ""
@@ -17267,7 +17544,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr ""
@@ -17314,108 +17591,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr ""
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr ""
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17432,4 +17622,9 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+msgid "services"
+msgstr ""
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17439,4 +17634,9 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+msgid "ford"
+msgstr ""
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17453,6 +17653,19 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
 msgstr ""
 
@@ -17466,5 +17679,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr ""
@@ -17478,5 +17691,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr ""
@@ -17490,5 +17703,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr ""
@@ -17516,5 +17729,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr ""
@@ -17529,4 +17742,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17566,5 +17780,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17681,12 +17895,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr ""
@@ -17732,5 +17947,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17748,7 +17963,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17771,10 +17986,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17804,6 +18019,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -17848,6 +18063,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -17861,5 +18076,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr ""
@@ -17881,5 +18096,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -17893,5 +18108,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -17914,4 +18129,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -17931,4 +18154,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr ""
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -17937,23 +18166,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr ""
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr ""
@@ -17967,5 +18183,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr ""
@@ -17979,5 +18196,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr ""
@@ -17990,6 +18208,20 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+msgid "piste_expert"
+msgstr ""
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18003,5 +18235,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr ""
@@ -18032,4 +18265,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18064,4 +18305,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18074,8 +18339,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr ""
@@ -18088,5 +18355,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr ""
@@ -18100,5 +18370,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr ""
@@ -18226,12 +18496,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr ""
@@ -18245,5 +18515,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr ""
@@ -18315,8 +18585,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18352,4 +18622,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18409,11 +18687,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18552,6 +18830,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18778,22 +19077,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -18825,6 +19124,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -18860,4 +19159,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -18877,7 +19184,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr ""
@@ -18971,4 +19279,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19171,4 +19487,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19202,28 +19534,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr ""
@@ -19277,4 +19611,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19287,8 +19629,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr ""
@@ -19343,4 +19685,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19437,9 +19780,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr ""
@@ -19511,8 +19854,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr ""
@@ -19582,9 +19925,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr ""
@@ -19598,5 +19941,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr ""
@@ -19610,5 +19953,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr ""
@@ -19630,5 +19973,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr ""
@@ -19642,5 +19985,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr ""
@@ -19654,5 +19997,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -19675,5 +20018,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr ""
@@ -19687,5 +20030,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr ""
@@ -19699,5 +20042,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19711,5 +20054,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -19723,5 +20066,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -19778,7 +20121,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr ""
@@ -19792,5 +20135,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr ""
@@ -19803,5 +20146,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr ""
@@ -19816,5 +20159,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr ""
@@ -19828,5 +20171,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr ""
@@ -19841,4 +20184,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19880,7 +20224,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr ""
@@ -19894,5 +20239,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr ""
@@ -19906,5 +20251,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr ""
@@ -19918,5 +20263,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr ""
@@ -19930,5 +20275,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr ""
@@ -19942,5 +20287,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr ""
@@ -20018,8 +20363,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr ""
@@ -20067,7 +20412,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr ""
@@ -20209,10 +20554,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr ""
@@ -20253,6 +20598,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr ""
@@ -20533,30 +20885,2 @@
 msgid "Streets NRW Geofabrik.de"
 msgstr ""
-
-#~ msgid "Java OpenStreetMap Editor Version {0}"
-#~ msgstr "Java OpenStreetMap Editor Versiunea {0}"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Vă rog selectaţi ceva din lista de conflicte."
-
-#~ msgid "Please select a color."
-#~ msgstr "Vă rog selectaţi o culoare."
-
-#~ msgid "Remove \"{0}\" for"
-#~ msgstr "Elimină \"{0}\" pentru"
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Nu porni pe întreg ecranul"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Ştiri despre JOSM"
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr ""
-#~ "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "Eroare date: valoarea lat \"{0}\" este în afara limitelor."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "Eroare date: valoarea lon \"{0}\" este în afara limitelor."
Index: /applications/editors/josm/i18n/po/ru.po
===================================================================
--- /applications/editors/josm/i18n/po/ru.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/ru.po	(revision 14844)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-25 05:24+0000\n"
-"Last-Translator: yohanson <Unknown>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-25 10:35+0000\n"
+"Last-Translator: JekaDer <yourname@mail.ru>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -23,5 +23,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Создание интерфейса"
@@ -39,38 +39,38 @@
 msgstr "Проекция не может быть прочитана из настроек. Используется EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Прим.: Некоторые изменения произошли из-за загрузки данных на сервер."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Несохранённые изменения"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Присутствуют несохранённые изменения. Сбросить изменения и продолжить?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Сохранить и выйти"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Отменить и выйти"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -81,10 +81,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -95,4 +95,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -102,10 +103,10 @@
 msgstr "Отмена"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнорируется неверная ссылка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -131,8 +132,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -273,5 +274,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -409,6 +410,6 @@
 msgstr "Перевернуть и объеденить"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -416,20 +417,20 @@
 msgstr "Введите значения для всех конфликтов."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Решение конфликтов"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Объединить {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Все линии были пустыми"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -533,5 +534,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -652,6 +653,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -660,6 +661,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -789,5 +790,5 @@
 msgstr "Очистить в любом случае"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -795,5 +796,5 @@
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1074,5 +1075,5 @@
 msgstr "Сохранить текущие данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1082,26 +1083,26 @@
 "создайте отчёт об ошибке."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Нет открытых документов. Нечего сохранять."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Пустой документ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "В документе не содержиться данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Сохранить в любом случае"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Конфликты"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1111,32 +1112,32 @@
 "будут обработаны, как будто вы отменили их все. Продолжить?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Отказаться от конфликтов и сохранить"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Сохранить файл GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Сохранить файл OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Невозможно создать резервную копию."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Неизвестное расширение файла."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "При сохранении возникла ошибка."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "При восстановлении из резервной копии возникла ошибка."
@@ -1194,18 +1195,18 @@
 msgstr "Закрыть"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Разделить линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Разделить линию в выбранной точке."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Текущее выделение невозможно разделить."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1214,5 +1215,5 @@
 msgstr[2] "Выбранные точки не являются частью пути."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1233,9 +1234,9 @@
 "выберите путь ещё."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "Выбранные точки не являются частью одной линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1244,10 +1245,10 @@
 msgstr[2] "Выбранная линия не содержит выбранных точек"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Чтобы разделить замкнутую линию, выберите две или более точки."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1257,5 +1258,5 @@
 "линии)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1265,5 +1266,5 @@
 "Проверьте, и при необходимости внесите корректировки."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1418,46 +1419,50 @@
 "желаете продолжить?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Загрузить на OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Загрузить все изменения на OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Новые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Изменённые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Удаляемые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Опишите изменения для закачиваемых данных:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Загрузить эти изменения?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Загрузить изменения"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Нечего загружать. Сначала создайте данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Присутствуют неразрешённые конфликты. Для начала, разрешите их"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Нет изменений для загрузки."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Загрузка данных"
@@ -1643,38 +1648,27 @@
 msgstr "Точка не может быть добавлена за пределами мира."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Добавить точку"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Вставить точку в линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Присоединить линию к точке"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Добавить точку к линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Добавить точку к линии и объединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Создать новую точку"
-
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
-#, java-format
-msgid "Insert new node into way."
-msgid_plural "Insert new node into {0} ways."
-msgstr[0] ""
-msgstr[1] "Вставить новую точку в путь"
-msgstr[2] "Вставить новую точку в {0} пути"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
@@ -1682,4 +1676,12 @@
 msgid "Select node under cursor."
 msgstr "Выбирете точко под курсором"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] "Вставить новый узел в линию"
+msgstr[1] "Вставить новую точку в {0} линии"
+msgstr[2] "Вставить новую точку в {0} линий"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -1752,6 +1754,7 @@
 msgid "Add and move a virtual new node to way"
 msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Добавьте или переместите виртуальную новую точку на путь"
-msgstr[1] "Добавьте или переместите виртуальную новую точку на {0} путях"
+msgstr[0] "Добавьте или переместите новый виртуальный узел в линию"
+msgstr[1] "Добавьте или переместите новый виртуальный узел в {0} линиях"
+msgstr[2] "Добавьте или переместите новый виртуальный узел в {0} линиях"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
@@ -1847,5 +1850,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
+msgstr "<b>foot:</b> - key=foot устанавливает в любых значениях."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
@@ -2106,5 +2109,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2302,5 +2305,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "железная дорога"
@@ -2323,127 +2326,127 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Путь, обозначающий границу области, не закрыт."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "многополигональная линия ''{0}'' не замкнута"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "В отношении имеется пустой член."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "В отношении «{0}» имеется член, который был удален."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Путь «{0}» имеет меньше двух точек."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Найден больше чем один \"from\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Найден больше чем один \"to\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "Найден больше чем один \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестная роль «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестный тип членства для «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Не найден путь \"from\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Не найден путь \"to\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "Не найдена \"via\" точка или путь"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"from\" путь не начинается или заканчивается на \"via\" точке."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"to\" путь не начинается или заканчивается на \"via\" точке."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"from\" путь не начинается или заканчивается на \"via\" пути."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"to\" путь не начинается или заканчивается на \"via\" пути."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стиль для ограничения {0} не найден."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Нет полезного значения ''{0}'' для пути ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "не-линия ''{0}'' в мультиполигональном отношении"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Для мультиполигона «{0}» отсутствует внешний путь."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Внутренний путь «{0}» находится снаружи."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стиль для внутренней ''{0}''одинаков с мультиполигоном."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стиль для внешней границы ''{0}'' отсутствует."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "без тэга"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "текст"
@@ -2451,5 +2454,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2478,5 +2481,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "фон"
@@ -2543,5 +2546,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2555,5 +2558,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2584,14 +2587,14 @@
 msgstr "Разрешённая версия:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Сообщение дня недоступно"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
-msgstr "- работающая версия {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+msgstr "- сейчас запущена версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Загружается \"Сообщение дня\""
@@ -2663,71 +2666,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Имя пользователя"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Не могу найти перевод {0}. Возвращено {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "использование"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Показать эту справку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Стандартный параметр геометрии unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Скачать область в пределах рамки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Открыть файл (как данные GPS, если .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Скачать область в пределах рамки, как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+msgstr "Выбор с учетом поиска"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr "Запуск в развернутом виде"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Восстановить параметры по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Установить язык."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "примеры"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2737,23 +2740,28 @@
 "убедитесь, что загружаете данные перед --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Вместо --download=<bbox> можно указать osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Включение обновлённых модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Загрузка ранних модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Загрузка модулей"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2931,9 +2939,9 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
 msgid "Toggle: {0}"
-msgstr "Переключить: {0}"
+msgstr "Показать/Скрыть: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:63
@@ -3123,5 +3131,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445
 msgid "Please select the objects you want to change properties for."
-msgstr "Выберите объекты, для которых вы желаете изменить свойства."
+msgstr "Выберите объекты, для которых вы желаете изменить параметры."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451
@@ -3141,5 +3149,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Роль"
@@ -3187,73 +3195,71 @@
 msgstr "Параметры / отношения"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Применить изменения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Создать новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Править новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Править отношение #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Основной"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Объект"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Тэги (пустое значение удаляет тэг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Переместить вверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Переместить выбранных членов отношения вверх"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Добавить выбранное"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Сделать все выбранные объекты участниками отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Удалить выбранные"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Удалить все выделенные объекты из связей"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Переместить вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Переместить выбранных членов отношения вниз"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3262,36 +3268,36 @@
 msgstr "Удалить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Удалить текущего участника из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Скачать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Скачать недостающие части линий и узлов, участвующих в отношении"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Участники: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Редактор отношений: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "При импортировании возникли конфликтные ситуации."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Ошибка при разборе ответа от сервера."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Невозможно связаться с сервером."
@@ -3305,10 +3311,11 @@
 msgstr "Удалить выбранное отношение"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Отношения"
@@ -3505,5 +3512,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Места"
@@ -3550,21 +3557,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "тип"
@@ -3617,10 +3624,7 @@
 msgstr "Используйте мышь, или Ctrl+стрелки/./ для изменения масштаба."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Карта"
@@ -3775,4 +3779,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3881,5 +3886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3942,19 +3947,34 @@
 "их время, были проигнорированы."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "вне области для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} состоит из:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} удалено)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "использование"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Версия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3962,21 +3982,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4078,4 +4098,6 @@
 "track you were playing (after the first marker)."
 msgstr ""
+"Вам необходимо перетащить значёк играющей головы рядом с от GPX трэком с "
+"которым связана звуковая дорожка (после первого маркера)."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
@@ -4084,4 +4106,6 @@
 "point where you want to synchronize."
 msgstr ""
+"Нужно удерживать Shift и перетащить значек играющей головы на аудио маркера "
+"или на точку трека, где вы хотите синхронизировать."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
@@ -4201,4 +4225,6 @@
 "button icons."
 msgstr ""
+"Поставьте текстовую надпись напротив аудио (и изображения и веб-сайта) "
+"маркеров, а также их кнопок."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:89
@@ -4263,4 +4289,6 @@
 "audio track position requested"
 msgstr ""
+"Воспроизведение начнется через это количество секунд до (или после, в случае "
+"отрицательного) звуковой дорожки у запрошенной позиции"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:161
@@ -4271,4 +4299,5 @@
 msgid "The ratio of voice recorder elapsed time to true elapsed time"
 msgstr ""
+"Соотношение времени диктофонной записи соответствует прошедшему времени"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:166
@@ -4418,5 +4447,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4501,4 +4530,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4582,7 +4613,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4595,7 +4623,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4611,10 +4646,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4783,5 +4818,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4815,7 +4852,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4899,4 +4936,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4949,4 +4994,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4955,7 +5006,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4964,15 +5012,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4997,129 +5034,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Название"
@@ -5165,15 +5204,13 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:504
 msgid "All"
-msgstr ""
+msgstr "Все"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Местность"
+msgstr "Локальные файлы"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Зона"
+msgstr "Нет"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5192,4 +5229,6 @@
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
+"Различение положения (красный = высоко, зеленый = низко, если таковые "
+"имеются)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
@@ -5200,45 +5239,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Авто"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Вело"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5246,25 +5275,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Пешком"
@@ -5314,7 +5348,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Отображать линии между точками трэков GPS"
+msgstr "Нарисуйте линии между первоначальными GPS точками"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5352,4 +5385,5 @@
 "one."
 msgstr ""
+"Не изображать стрелки, если их нет на этом расстоянии от последних стрелок"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:127
@@ -5455,9 +5489,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
 msgid "Modeless working (Potlatch style)"
-msgstr ""
+msgstr "Безрежимная работа (в стиле Potlatch)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
 msgid "Do not require to switch modes (potlatch style workflow)"
-msgstr ""
+msgstr "Не требует переключения режимов (рабочий стиль potlatch)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
@@ -5889,5 +5923,5 @@
 #, java-format
 msgid "Could not read tagging preset source: {0}"
-msgstr ""
+msgstr "Не удалось прочитать помеченные настройки исходника: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:561
@@ -5950,10 +5984,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "Ошибка! Возможно отсутствуют тэги."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Подготовка данных..."
@@ -5963,25 +5997,75 @@
 msgstr "Ошибка разбора: неправильная структура документа gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Открывается список правок..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Закрывается список правок..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Нет изменений для загрузки."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Подготовка..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Закачка..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Ошибка при разборе ответа от сервера."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Неизвестный хост"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Неправильный пароль или имя пользователя."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Внимание: Пароль будет передан в незашифрованном виде."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Сохранить имя пользователя и пароль (не зашифровано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Введите пароль"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Идентификатор пользователя"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5992,44 +6076,54 @@
 msgstr "Ошибка при разборе."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Неизвестная версия"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Неизвестная версия"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Найден элемент <nd> вне пути."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "у <nd> нет ссылок ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Найден тэг <member> вне отношения."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Неполная спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Недопустимый объект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Отсутствует необходимый атрибут \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+"Пропуск линии потому, что она включает в себя узлы, которые не существуют: "
+"{0}\n"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Подготовка данных..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Неверный номер точки"
@@ -6039,5 +6133,5 @@
 msgstr "Соединение с сервером..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -6046,5 +6140,5 @@
 "соединение."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6054,55 +6148,8 @@
 "повторите попытку позже."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Опишите изменения для закачиваемых данных:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Комментарий правки"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} осталось. Загрузка {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Произошла ошибка: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Открывается список правок..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Сервер не поддерживает управление версиями"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Неизвестный хост"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Подготовка..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Закачка..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Закрывается список правок..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6197,5 +6244,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
 msgid "Keep plugin"
-msgstr ""
+msgstr "Сохранение плагина"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -6272,6 +6319,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "неизвестный"
@@ -6460,7 +6507,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Создание областей"
+msgstr "Создать сетки линий"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6469,21 +6515,22 @@
 "in common"
 msgstr ""
+"Формировать сетку линий основанную на двух существующих линиях, которые "
+"имеют различные узлы и один общий"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Выберите две линии, с общим узлом"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Выберите два пути с единственным общим узлом"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Создание областей"
+msgstr "Создание сетки линий"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
 msgid "Upload Trace"
-msgstr ""
+msgstr "Загрузка трэка"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82
@@ -6491,5 +6538,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 msgid "Upload Traces"
-msgstr ""
+msgstr "Загрузка трэков"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
@@ -6499,9 +6546,9 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103
 msgid "Selected makes your trace public in openstreetmap.org"
-msgstr ""
+msgstr "Выбор сделает ваш трэк общественным на сайте openstreetmap.org"
 
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Описание"
@@ -6509,19 +6556,19 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
 msgid "Please enter Description about your trace."
-msgstr ""
+msgstr "Пожалуйста введите описание вашего трэка"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:229
 msgid "Tags"
-msgstr ""
+msgstr "Тэги"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109
 msgid "Please enter tags about your trace."
-msgstr ""
+msgstr "Введите теги описывающие ваш трэк."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:155
 #, java-format
 msgid "Selected track: {0}"
-msgstr ""
+msgstr "Выбранный трэк: {0}"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:178
@@ -6531,55 +6578,55 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:201
 msgid "Upload cancelled"
-msgstr ""
+msgstr "Загрузка отменена"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:211
 msgid "Error while uploading"
-msgstr ""
+msgstr "Ошибка во время загрузки"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262
 msgid "GPX upload was successful"
-msgstr ""
+msgstr "Загрузка GPX успешно закончена"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:263
 msgid "Upload failed. Server returned the following message: "
-msgstr ""
+msgstr "Загрузка прервалась. Сервер ответил следующим сообщением: "
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:305
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
-msgstr ""
+msgstr "Загрузка GPX трэка: {0}% ({1} из {2})"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:337
 msgid "No description provided. Please provide some description."
-msgstr ""
+msgstr "Нет описания. Просьба представить некоторое описание."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:340
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:362
 msgid "No GPX layer selected. Cannot upload a trace."
-msgstr ""
+msgstr "Слой GPX не выбран. Не удается загрузить трэк."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:343
 msgid "No username provided."
-msgstr ""
+msgstr "Нет имени пользователя"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
 msgid "No password provided."
-msgstr ""
+msgstr "Нет пароля"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378
 msgid "Uploading GPX Track"
-msgstr ""
+msgstr "Загрузка GPX трэка"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 msgid "Uploads traces to openstreetmap.org"
-msgstr ""
+msgstr "Загрузка трэков на сайт openstreetmap.org"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "AgPifoJ - Geotagged pictures"
-msgstr ""
+msgstr "AgPifoJ - Изображения с геотэгами"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 msgid "Display geotagged photos"
-msgstr ""
+msgstr "Показать изображения с геотэгами"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70
@@ -6599,9 +6646,9 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
 msgid "Center view"
-msgstr ""
+msgstr "Центрировать вид"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
 msgid "Zoom best fit and 1:1"
-msgstr ""
+msgstr "Масштабировать с лучшим расположением и 1:1"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166
@@ -6629,5 +6676,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:109
 msgid "Starting directory scan"
-msgstr ""
+msgstr "Запуск сканирования каталога"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:114
@@ -6642,5 +6689,5 @@
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
-msgstr ""
+msgstr "Не удалось получить канонический путь к каталогу {0}\n"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:187
@@ -6661,5 +6708,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:260
 msgid "Correlate to GPX"
-msgstr ""
+msgstr "Коррелируют с GPX"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:279
@@ -6692,4 +6739,7 @@
 "on the photo and select a timezone<hr></html>"
 msgstr ""
+"<html> Сделайте фото вашего GPS приемника, когда он показывает время. <br> "
+"Покажите это фото здесь. <br> И потом, просто захват время которое вы "
+"прочитаете на фото и выберите часовой пояс <hr> </ HTML>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228
@@ -6720,5 +6770,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374
 msgid "Synchronize time from a photo of the GPS receiver"
-msgstr ""
+msgstr "Синхронизация времени с фотографией GPS-приемника"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385
@@ -6761,5 +6811,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508
 msgid "Update position for: "
-msgstr ""
+msgstr "Обновление позиции для: "
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517
@@ -6769,5 +6819,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
 msgid "Images with no exif position"
-msgstr ""
+msgstr "Изображения без координат в заголовках Exif"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537
@@ -6777,13 +6827,13 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557
 msgid "Correlate images with GPX track"
-msgstr ""
+msgstr "Сопоставить изображения с GPX треком"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
 msgid "Correlate"
-msgstr ""
+msgstr "Совпадения"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
 msgid "Auto-Guess"
-msgstr ""
+msgstr "Авто-Угадывание"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569
@@ -6801,4 +6851,6 @@
 "Expected format: {0}"
 msgstr ""
+"Ошибка при разборе часового пояса.\n"
+"Ожидаемый формат: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583
@@ -6812,4 +6864,6 @@
 "Expected format: {0}"
 msgstr ""
+"Ошибка при разборе смещения.\n"
+"Ожидаемый формат: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596
@@ -6820,5 +6874,5 @@
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
-msgstr ""
+msgstr "Надено {0} совпадений из {1} в GPX трэке {2}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640
@@ -6828,9 +6882,9 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675
 msgid "The selected photos don't contain time information."
-msgstr ""
+msgstr "ыбранные фотографии не содержат информацию о времени."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676
 msgid "Photos don't contain time information"
-msgstr ""
+msgstr "Фотографии не содержать информацию о времени"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713
@@ -6838,38 +6892,39 @@
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
+"Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714
 msgid "GPX Track has no time information"
-msgstr ""
+msgstr "GPX трек не содержит информации о времени"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759
 #, java-format
 msgid "Timezone: {0}"
-msgstr ""
+msgstr "Часовой пояс: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760
 #, java-format
 msgid "Minutes: {0}"
-msgstr ""
+msgstr "Минуты: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761
 #, java-format
 msgid "Seconds: {0}"
-msgstr ""
+msgstr "Секунды: {0}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:779
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
-msgstr ""
+msgstr "Совпавшие {0} из {1} фотографий с GPX треком."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
 #, java-format
 msgid "(Time difference of {0} days)"
-msgstr ""
+msgstr "(Разница во времени {0} дней)"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:789
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
-msgstr ""
+msgstr "Смещение между треком и фотографией: {0}м {1}с"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
@@ -6878,16 +6933,18 @@
 "adjust the sliders to manually match the photos."
 msgstr ""
+"Произошла ошибка при попытке сопоставить фотографии с GPX треком. Вы можете "
+"настроить вручную с помощью ползунов соответствие фотографиям."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
 msgid "Matching photos to track failed"
-msgstr ""
+msgstr "Сопоставление фотографий треку прервано"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
 msgid "Adjust timezone and offset"
-msgstr ""
+msgstr "Настройка часового пояса и смещения"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
 msgid "Default Values"
-msgstr ""
+msgstr "Значения по умолчанию"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:433
@@ -6914,17 +6971,17 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:16
 msgid "Lambert Zone 1 cache file (.1)"
-msgstr ""
+msgstr "Lambert зона 1 кэш файл (.1)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17
 msgid "Lambert Zone 2 cache file (.2)"
-msgstr ""
+msgstr "Lambert зона 21 кэш файл (.2)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18
 msgid "Lambert Zone 3 cache file (.3)"
-msgstr ""
+msgstr "Lambert зона 3 кэш файл (.3)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19
 msgid "Lambert Zone 4 cache file (.4)"
-msgstr ""
+msgstr "Lambert зона 4 кэш файл (.4)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
@@ -6932,5 +6989,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165
 msgid "CadastreGrabber: Illegal url."
-msgstr ""
+msgstr "CadastreGrabber: Не правильная ссылка"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:65
@@ -6940,33 +6997,35 @@
 "Please check its availibility on www.cadastre.gouv.fr"
 msgstr ""
+"Город {0} не найден или не сдоступен в WMS.\n"
+"Пожалуйста проверьте его доступность на www.cadastre.gouv.fr"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:283
 msgid "Choose from..."
-msgstr ""
+msgstr "Выбрать из..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:292
 msgid "Select commune"
-msgstr ""
+msgstr "Выберите коммуну"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:306
 msgid "Select Tableau d'Assemblage"
-msgstr ""
+msgstr "Выберите Таблицу d'Assemblage"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:129
 msgid "Cadastre"
-msgstr ""
+msgstr "Кадастр"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:138
 msgid "Auto sourcing"
-msgstr ""
+msgstr "Авто источники"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:163
 msgid "Invalid projection"
-msgstr ""
+msgstr "Неправильная проекция"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164
 #, java-format
 msgid "Change the projection to {0} first."
-msgstr ""
+msgstr "Изменение проекции на {0} в первую очередь."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:168
@@ -6975,12 +7034,14 @@
 "the JOSM projection to Lambert and restart"
 msgstr ""
+"Для включения кадастрового WMS плагина, измените\n"
+"в JOSM проекцию на Ламберта и перезапустите"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
 msgid "Replace original background by JOSM background color."
-msgstr ""
+msgstr "Заменить оригинальный фон JOSM на цвет фона."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
 msgid "Reverse grey colors (for black backgrounds)."
-msgstr ""
+msgstr "Обратить серые цвета (для черного фона)."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
@@ -6990,5 +7051,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Draw boundaries of downloaded data."
-msgstr ""
+msgstr "Нарисовать границы загруженных данных."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
@@ -7009,4 +7070,10 @@
 "by this plugin."
 msgstr ""
+"Особый обработчик на французском кадастр WMS сервете на www.cadastre.gouv.fr "
+"<BR> <BR> Пожалуйста, прочитайте условия использования здесь (по-"
+"французски): <br> <A HREF = \"http://www. cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html \"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html </A> <BR> до загрузки каких-либо данных, "
+"созданный этим плагином ."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
@@ -7016,5 +7083,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
-msgstr ""
+msgstr "<html>Значение тэга  \"source\" когда включенs автоисточники</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
@@ -7028,4 +7095,5 @@
 "preferences."
 msgstr ""
+"Заменить оригинальный белый фон на цвет фона, определенные в настройках JOSM."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
@@ -7034,21 +7102,24 @@
 "Useful for texts on dark backgrounds."
 msgstr ""
+"Инвертировать оригинальные черно-белые цвета (и все промежуточные серые). "
+"Полезно для текстов на темном фоне."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87
 msgid "Allows multiple layers stacking"
-msgstr ""
+msgstr "Позволяет соединять несколько слоев"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
+"Установить прозрачность слоев  WMS. С право непрозрачный, слева прозрачный."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102
 msgid "Draw a rectangle around downloaded data from WMS server."
-msgstr ""
+msgstr "Нарисовать прямоугольник вокруг загруженных данных с сервера WMS."
 
 #. the downloaded images multiplier
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
 msgid "Image grab multiplier:"
-msgstr ""
+msgstr "Множитель скачанного изображения"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
@@ -7056,24 +7127,25 @@
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
+"Взять мелкие изображения (высокое качество, но использует больше памяти)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
 msgid "Fixed size square (default is 100m)"
-msgstr ""
+msgstr "Фиксированный размер площади (по умолчанию 100 м)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
 msgid "Fixed size (from 25 to 1000 meters)"
-msgstr ""
+msgstr "Фиксированный размер (от 25 до 1000 метров)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
 msgid "Oldest files are automatically deleted when this size is exceeded"
-msgstr ""
+msgstr "Более старые файлы автоматически удаляются, когда этот размер превышен"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:78
 msgid "Auto-tag source added:"
-msgstr ""
+msgstr "Добавлены авто-теги к источнику:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:83
 msgid "Add \"source=...\" to elements?"
-msgstr ""
+msgstr "Добавить \"source=...\" к элементам?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43
@@ -7088,9 +7160,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
 msgid "Contacting WMS Server..."
-msgstr ""
+msgstr "Соединение с WMS Server..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
 msgid "Create buildings"
-msgstr ""
+msgstr "Создание зданий"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264
@@ -7099,34 +7171,36 @@
 "building import size is limited to 1 km2 max."
 msgstr ""
+"Чтобы избежать перегрузки кадастра WMS,\n"
+"размер импортируемого здания ограничено, максимум 1 км2 ."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215
 msgid "Please, enable auto-sourcing and check cadastre millesime."
-msgstr ""
+msgstr "Пожалуйста, включите Авто-источники и проверте millesime кадастр."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
 msgid "Extract SVG ViewBox..."
-msgstr ""
+msgstr "Экспортировать окно просмотра SVG"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
 msgid "Extract best fitting boundary..."
-msgstr ""
+msgstr "Выделить лучшее расположение границы"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
 msgid "Create boundary"
-msgstr ""
+msgstr "Создать границы"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20
 msgid "Extract commune boundary"
-msgstr ""
+msgstr "Выделить общие границы"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
 msgid "Only on vectorized layers"
-msgstr ""
+msgstr "Только на векторизованных слоях"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
 msgid "Extract building footprints"
-msgstr ""
+msgstr "Выделить основание здания"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:22
@@ -7138,9 +7212,10 @@
 #, java-format
 msgid "Cadastre: {0}"
-msgstr ""
+msgstr "Кадастр: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
 msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
 msgstr ""
+"Установить вручную Ламберт зоны (например, для места между двумя зонами)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33
@@ -7154,25 +7229,25 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19
 msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgstr "Загрузка расположения из кэша (только если кэш включен)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
-msgstr ""
+msgstr "Изменить расположение"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
-msgstr ""
+msgstr "Установить новое место для следующего запроса"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38
 msgid "Open a layer first (GPX, OSM, cache)"
-msgstr ""
+msgstr "Открыть сначала слой (GPX, OSM, кэш)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
 msgid "Add a new layer"
-msgstr ""
+msgstr "Добавить новый слой"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52
 msgid "Location"
-msgstr ""
+msgstr "Расположение"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -7181,4 +7256,6 @@
 "known by www.cadastre.gouv.fr .</html>"
 msgstr ""
+"<html> войти в село, деревню или город. <br> Использовать синтаксис и "
+"пунктуацию опубликованную www.cadastre.gouv.fr </html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
@@ -7192,5 +7269,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
 msgid "Get a new cookie (session timeout)"
-msgstr ""
+msgstr "Получить новые кукисы (тайм-аут сеанса)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58
@@ -7199,6 +7276,7 @@
 msgid "Simplify Way (remove {0} node)"
 msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Упростить линию (удален {0} узел)"
+msgstr[1] "Упростить линию (удалено {0} узлов)"
+msgstr[2] "Упростить линию (удалено {0} узлов)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
@@ -7215,5 +7293,5 @@
 #, java-format
 msgid "Download WMS tile from {0}"
-msgstr ""
+msgstr "Скачать фрагмент WMS из {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43
@@ -7222,4 +7300,6 @@
 "Select one of them first, then retry"
 msgstr ""
+"Присутствует больше, чем один слой WMS\n"
+"Выберите сначала один из них, а затем повторите"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:81
@@ -7232,23 +7312,23 @@
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
-msgstr ""
+msgstr "слой WMS  ({0}), {1} фрагмент(ы) загружен(ы)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
 msgid "Is not vectorized."
-msgstr ""
+msgstr "Не векторизованны."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185
 #, java-format
 msgid "Raster center: {0}"
-msgstr ""
+msgstr "Центр растра: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187
 msgid "Is vectorized."
-msgstr ""
+msgstr "Векторизован."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188
 #, java-format
 msgid "Commune bbox: {0}"
-msgstr ""
+msgstr "общий квадрат: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283
@@ -7267,4 +7347,5 @@
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
+"Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323
@@ -7279,4 +7360,6 @@
 "Create a new one."
 msgstr ""
+"Неподдерживаемая версия кэш файла; обнаружено {0}, ожидалось {1}\n"
+"Создайте новый файл."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:527
@@ -7291,5 +7374,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:544
 msgid "Cache Lambert Zone Error"
-msgstr ""
+msgstr "Ошибка кеширования зоны Ламберта"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -7349,17 +7432,17 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
 msgid "Layer for editing GPX tracks"
-msgstr ""
+msgstr "Слой для редактирования GPX трэков"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:217
 msgid "Convert to GPX layer with anonymised time"
-msgstr ""
+msgstr "Преобразовать в GPX слой с обезличенным временем"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46
 msgid "edit gpx tracks"
-msgstr ""
+msgstr "Редактировать GPX трэки"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85
 msgid "EditGpx"
-msgstr ""
+msgstr "РедакторGpx"
 
 #. TODO what is icon at the end?
@@ -7398,41 +7481,41 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
 msgid "A By Time"
-msgstr ""
+msgstr "А - По времени"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
 msgid "A By Distance"
-msgstr ""
+msgstr "А - По дистанции"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
 msgid "B By Time"
-msgstr ""
+msgstr "В - По времени"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
 msgid "B By Distance"
-msgstr ""
+msgstr "В - По дистанции"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
 msgid "C By Time"
-msgstr ""
+msgstr "С - По времени"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
 msgid "C By Distance"
-msgstr ""
+msgstr "С - По дистанции"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
 msgid "Data Logging Format"
-msgstr ""
+msgstr "Формат лог данных"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
 msgid "Disable data logging if speed falls below"
-msgstr ""
+msgstr "Отключение записи лог данных, если скорость падает ниже"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
 msgid "Disable data logging if distance falls below"
-msgstr ""
+msgstr "Отключение записи лог данных, если расстояние падает ниже"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
 msgid "Unknown logFormat"
-msgstr ""
+msgstr "Неизвестный лог формат"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
@@ -7464,5 +7547,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:130
 msgid "configure the connected DG100"
-msgstr ""
+msgstr "настроить подключенный DG100"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
@@ -7501,4 +7584,7 @@
 "plugin/"
 msgstr ""
+"Не удается загрузить библиотеку rxtxSerial. Если вам нужна поддержка "
+"попробуйте установить её на главной странице GlobalSat http://www.raphael-"
+"mack.de/josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
@@ -7517,5 +7603,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:192
 msgid "Grid origin location"
-msgstr ""
+msgstr "Сетка основного местонахождения"
 
 #: ../plugins/grid/src/grid/GridLayer.java:197
@@ -7537,5 +7623,5 @@
 #: ../plugins/grid/src/grid/GridPlugin.java:27
 msgid "Add grid"
-msgstr ""
+msgstr "Добавить сетку"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
@@ -7586,5 +7672,5 @@
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
 msgid "Display non-geotagged photos"
-msgstr ""
+msgstr "Показать фотографии без геотэгов"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74
@@ -7619,5 +7705,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 msgid "Lake Walker."
-msgstr ""
+msgstr "Озёрный Уокер"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
@@ -7665,5 +7751,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112
 msgid "Lakewalker trace"
-msgstr ""
+msgstr "ОзёрныйУокер трассировщик"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -7742,7 +7828,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "вода"
@@ -7758,5 +7844,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "none"
-msgstr ""
+msgstr "ничего"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
@@ -7766,5 +7852,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of nodes in initial trace"
-msgstr ""
+msgstr "Максимальное количество узлов на начальном трэке"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
@@ -7786,17 +7872,17 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Shift all traces to east (degrees)"
-msgstr ""
+msgstr "перевод всех трэков на восток (градусы)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to north (degrees)"
-msgstr ""
+msgstr "перевод всех трэков на север (градусы)"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Direction to search for land"
-msgstr ""
+msgstr "Направление для поиска места"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Tag ways as"
-msgstr ""
+msgstr "Прорставить тэг линии"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
@@ -7826,4 +7912,6 @@
 "lines). Default 50000."
 msgstr ""
+"Максимальное количество узлов сгенерированых перед очисткой (до упрощения "
+"линий). По умолчанию 50000."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
@@ -7832,4 +7920,6 @@
 "in the range 0-255. Default 90."
 msgstr ""
+"Максимальная серое значение принято в качестве воды (на основе данных "
+"Лэндсат IR-1). Может быть в диапазоне 0-255. Стандартное значение 90."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
@@ -7869,4 +7959,6 @@
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
+"Назначить линии тэг вода, берега, земли или ничего. По умолчанию, является "
+"вода."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
@@ -7884,5 +7976,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Data source text. Default is Landsat."
-msgstr ""
+msgstr "Данные исходного текста. По умолчанию Лэндсат."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
@@ -7924,5 +8016,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
 msgid "Live GPS"
-msgstr ""
+msgstr "Live GPS"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -7964,9 +8056,9 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 msgid "Center Once"
-msgstr ""
+msgstr "Центрировать"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:53
 msgid "Center the LiveGPS layer to current position."
-msgstr ""
+msgstr "Центрировать слой LiveGPS на текущей позиции"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
@@ -7976,9 +8068,9 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:67
 msgid "Continuously center the LiveGPS layer to current position."
-msgstr ""
+msgstr "Продолжить центрировать слой LiveGPS на текущей позиции"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:82
 msgid "LiveGPS"
-msgstr ""
+msgstr "LiveGPS"
 
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:68
@@ -8043,5 +8135,5 @@
 msgstr "Цикл скачивания из OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Отображает проблемы из OpenStreetBugs"
@@ -8060,4 +8152,11 @@
 msgstr "Предупреждение"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Произошла ошибка: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8086,35 +8185,38 @@
 "Видимая область слишком мала/велика для скачивания данных из OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Добавить комментарий"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Введите Ваш комментарий"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Отметить \"сделано\""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Вы действительно желаете отметить проблему, как решённую?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Действительно закрыть?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Новая проблема"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Указать новую проблему"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Опишите проблему как можно подробнее"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Указать новую проблему"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8143,5 +8245,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8151,9 +8253,9 @@
 "Настройки карты в окне настроек."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
-msgstr ""
-
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+msgstr "Настройки osm рендера"
+
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "исполняемый файл Firefox"
@@ -8227,129 +8329,113 @@
 "следующей ссылке:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Навигация"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr "Маршрутизация"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Ничего"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "Щелкните для добавления узлов маршрутизации"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Щёлкните, чтобы добавить новую точку."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "Щелкните и перетащите для перемещения узлов маршрутизации"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Щёлкните, чтобы добавить новую точку."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "Щелкните для добавления узлов маршрутизации"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "Открыть список узлов маршрутизации"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "Удаление повторяющихся точек..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Показать список всех отношений."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Станция"
+msgid "Add routing layer"
+msgstr "Добавить новый слой"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "средний"
+msgstr "Критерии"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Обувь"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "Кратчайший"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Быстрее"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "Самый быстрый"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Изменить направление линии"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr "Обратный маршрут"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Паромная переправа"
+msgstr "Очистить маршрут"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Настройки модуля WMS"
+msgstr "Настройки Плугина Маршрутизации"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Настроить сайты с модулями"
+msgstr "Настройка предпочтений маршрутизации."
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Съезд с дороги"
+msgstr "Тип шоссе"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Макс. скорость (км/ч)"
+msgstr "Скорость (км/ч)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Высота"
+msgstr "Толщина"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "Введите значение толщины"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Интерактивная карта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+msgstr "Загрузить фрагмент"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+msgstr "Показать статус фрагмента"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Запросить обновление"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+msgstr "Загрузить все фрагменты"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+msgstr "Приблизить"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+msgstr "Отодвинуть"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "изображение не загружено"
@@ -8357,49 +8443,49 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
 msgid "autozoom"
-msgstr ""
+msgstr "Автозум"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
 msgid "autoload tiles"
-msgstr ""
+msgstr "автозагрузка фрагментов"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "SlippyMap"
-msgstr ""
+msgstr "ПростаяКарта"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
 msgid "Settings for the SlippyMap plugin."
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+msgstr "Настройки для SlippyMap плагин."
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+msgstr "Источник фрагментов"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
-msgstr ""
+msgstr "Авто приближени: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr "Автозагружаемые фрагменты: "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+msgstr "Уровень макс. приближения: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+msgstr "Бледный фон: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "ошибка загрузки метаданных"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+msgstr "предлагается: {0}"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "ошибка при запросе обновления"
@@ -8408,11 +8494,11 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 msgid "AutoSave LiveData"
-msgstr ""
+msgstr "Автосохраниени ЖивыхДанных"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
 msgid "Save captured data to file every minute."
-msgstr ""
-
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+msgstr "Сохранять захваченные данные в файл каждую минуту."
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8423,9 +8509,11 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
 msgid "Way: "
-msgstr ""
+msgstr "Линия: "
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
 msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
 msgstr ""
+"Дублирующиеся сочетание клавиш для кнопки '{0}'  - кнопка будет "
+"игнорироваться!"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:47
@@ -8436,19 +8524,19 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr ""
+msgstr "Инспектор..."
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
-msgstr ""
+msgstr "Открыть инструментарий инспектора"
 
 #. surveyorFrame.setTitle((String)getValue(AbstractAction.NAME));
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
-msgstr ""
+msgstr "Инспектор"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
-msgstr ""
+msgstr "Не удалось прочитать определения инспектора: {0}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
@@ -8467,7 +8555,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Править штат"
+msgstr "Редактировать теги"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8475,68 +8562,60 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Запуск диалога тег редактора"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "JOSM Тег Редактор Плагин"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "узел"
+msgstr "(отсутствует)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "подсветка"
+msgstr "Выделение"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "несколько"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr "<множественный>"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Изменить параметры {0} объекта"
-msgstr[1] "Изменить параметры {0} объектов"
-msgstr[2] "Изменить параметры {0} объектов"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] "Удалить старые ключи из  {0} объекта"
+msgstr[1] "Удалить старые ключи из  {0} объектов"
+msgstr[2] "Удалить старые ключи из  {0} объектов"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Изменить параметры {0} объекта"
-msgstr[1] "Изменить параметры {0} объектов"
-msgstr[2] "Изменить параметры {0} объектов"
+msgstr[0] "Обновление свойств {0} объекта"
+msgstr[1] "Обновление свойств {0} объектов"
+msgstr[2] "Обновление свойств {0} объектов"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "маршрут"
+msgstr "Группа"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Ручей"
+msgstr "Запись"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Поиск"
+msgstr "Поиск: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Файл"
+msgstr "Фильтр"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Авто"
+msgstr "Очистить"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8544,5 +8623,5 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
 msgid "Tagging Preset Tester"
-msgstr ""
+msgstr "Тестирование Настроек Тегов"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
@@ -8550,8 +8629,10 @@
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
+"Откройте настройки инструментов для установки тегов для предварительного "
+"просмотра диалога настроек тегов."
 
 #: ../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 "В первую очередь Вы должны указать источник настроек тегов."
 
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:37
@@ -8566,59 +8647,59 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
 msgid "Reverse a terrace"
-msgstr ""
+msgstr "Обратный ряд домов вдоль улицы"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverses house numbers on a terrace."
-msgstr ""
+msgstr "Перевернуть номера домов вдоль улицы"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverse a Terrace"
-msgstr ""
+msgstr "Обратный ряд домов вдоль улицы"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113
 msgid "Reverse Terrace"
-msgstr ""
+msgstr "Обратный ряд домов вдоль улицы"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:78
 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
 msgid "Terrace a building"
-msgstr ""
+msgstr "Ряд домов вдоль улицы"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:80
 msgid "Creates individual buildings from a long building."
-msgstr ""
+msgstr "Создать отдельные здания  из длинного здания"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
 msgid "Select a single, closed way of at least four nodes."
-msgstr ""
+msgstr "Выберите одину, замкнутую линию по крайней мере из четырех узлов."
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
 msgid "Terrace"
-msgstr ""
+msgstr "Ряд домов вдоль улицы"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:423
 #: ../plugins/terracer/src/terracer/TerracerAction.java:447
 msgid "Even"
-msgstr ""
+msgstr "Четные"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:424
 msgid "Odd"
-msgstr ""
+msgstr "Нечетные"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:482
 msgid "Highest number"
-msgstr ""
+msgstr "Максимальный номер"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:483
 msgid "Lowest number"
-msgstr ""
+msgstr "Минимальный номер"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:484
 msgid "Interpolation"
-msgstr ""
+msgstr "Интерполяция"
 
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Название улицы"
@@ -8626,5 +8707,5 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
 msgid "Optional"
-msgstr ""
+msgstr "Необъязательно"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:73
@@ -8635,5 +8716,5 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:78
 msgid "Show Author Panel"
-msgstr ""
+msgstr "Показать панель автора"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98
@@ -8647,9 +8728,9 @@
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112
 msgid "Select User's Data"
-msgstr ""
+msgstr "Выбрать данные пользователя"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113
 msgid "Replaces Selection with Users data"
-msgstr ""
+msgstr "Заменить выбранное данными пользователя"
 
 #: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148
@@ -8676,17 +8757,19 @@
 msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 msgstr ""
+"ЭТО ЭКСПЕРИМЕНТАЛЬНАЯ ВОЗМОЖНОСТЬ. Сохраните вашу работу и проверьте перед "
+"загрузкой."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
 msgid "Continue anyway"
-msgstr ""
+msgstr "Продолжить в любом случае"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
 msgid "Only up to two areas can be joined at the moment."
-msgstr ""
+msgstr "Только два района могут быть объединены в данный момент."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
 #, java-format
 msgid "\"{0}\" is not closed and therefore can't be joined."
-msgstr ""
+msgstr "\"{0}\" не замкнут, и поэтому они не могут быть объединены."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170
@@ -8704,36 +8787,35 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
 msgid "Please abort if you are not sure"
-msgstr ""
+msgstr "Пожалуйста, остановитесь, если вы не уверены"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187
 msgid "Please select at least one closed way the should be joined."
 msgstr ""
+"Пожалуйста, выберите по крайней мере, одну замкнутую линию, которые должны "
+"быть объединены."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
 msgid "No intersections found. Nothing was changed."
-msgstr ""
+msgstr "Пересечения найдено. Ничего не изменялось."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Добавлены узлы на всех пересечениях"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
+msgstr "Удалить линии, которые не являются частью внутреннего мультиполигона"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "отношение"
+msgstr "Исправить отношения"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Объединить накладывающиеся области"
+msgstr "Присоединить самоперекрывающиеся области"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Объединить накладывающиеся области"
+msgstr "Присоединить перекрывающиеся области"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8742,53 +8824,51 @@
 "verify no errors have been introduced."
 msgstr ""
+"Некоторые из этих линий являются частью отношений, которые были изменены. "
+"Пожалуйста, проверьте не появились ли ошибки."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Разрешение конфликтов."
+msgstr "Инсправить конфликт тегов"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Удалить из связи"
+msgstr "Удалить Элементы из Отношений"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Присоединить районы: удаление коротких путей"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Незамкнутые линии"
+msgstr "Замкнутая линия"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Удалить фото из слоя"
+msgstr "Удаление тегов у внутренних линий"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Развязка Автобана"
+msgstr "Присоединить районы функционирования"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
 msgid "Jump To Position"
-msgstr ""
+msgstr "Перейти на позицию"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
 msgid "Opens a dialog that allows to jump to a specific location"
 msgstr ""
+"Открывает диалоговое окно, которое позволяет перейти к определенной местности"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
 msgid "Enter Lat/Lon to jump to position."
-msgstr ""
+msgstr "Введите Lat / Lon, чтобы перейти к позиции."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67
 msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr ""
+msgstr "Вы также можете вставить URL из www.openstreetmap.org"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99
 msgid "Zoom (in metres)"
-msgstr ""
+msgstr "Приближение (в метрах)"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
@@ -8798,17 +8878,19 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
 msgid "Jump there"
-msgstr ""
+msgstr "Перейти туда"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
 msgid "Jump to Position"
-msgstr ""
+msgstr "Перейти к позиции"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr ""
+"Невозможно проанализировать широту, долготу и увеличение. Пожалуйста, "
+"проверьте."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
 msgid "Unable to parse Lon/Lat"
-msgstr ""
+msgstr "Невозможно разобрать широту/долготу"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
@@ -8830,5 +8912,11 @@
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr[0] ""
+"Выделение содержит {0}  линию. способом. Вы уверены, что хотите упростить её?"
 msgstr[1] ""
+"Выделение содержит {0} линий. способом. Вы уверены, что хотите упростить их "
+"все?"
+msgstr[2] ""
+"Выделение содержит {0} линий. способом. Вы уверены, что хотите упростить их "
+"все?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
@@ -8879,9 +8967,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80
 msgid "Show informational level on upload."
-msgstr ""
+msgstr "Показать информационный уровень при загрузке."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show the informational tests in the upload check windows."
-msgstr ""
+msgstr "Показать информационное тесты в окне проверки загрузки"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86
@@ -9037,5 +9125,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
 msgid "This test checks that there are no nodes at the very same location."
-msgstr ""
+msgstr "Этот тест проверяет, чтобы не было совпадения узлов."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
@@ -9049,5 +9137,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
 msgid "Duplicated way nodes"
-msgstr ""
+msgstr "Дублирующиеся узлы на линии"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
@@ -9079,25 +9167,25 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:110
 msgid "Overlapping highways (with area)"
-msgstr ""
+msgstr "Перекрытие магистралей (местами)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:115
 msgid "Overlapping railways (with area)"
-msgstr ""
+msgstr "Перекрытие железнодорожных путей (местами)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:120
 msgid "Overlapping ways (with area)"
-msgstr ""
+msgstr "Перекрытие линий (местами)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:126
 msgid "Overlapping highways"
-msgstr ""
+msgstr "Перекрытие магистралей"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:131
 msgid "Overlapping railways"
-msgstr ""
+msgstr "Перекрытие железнодорожных путей"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:136
 msgid "Overlapping ways"
-msgstr ""
+msgstr "Перекрытие линий"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:21
@@ -9129,14 +9217,15 @@
 msgid "This plugin checks for errors in property keys and values."
 msgstr ""
+"Этот плагин проверяет на наличие ошибок в названиях ключей и их значений."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:218
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
-msgstr ""
+msgstr "Неправильно просталенныех тегов линиий - {0}: {1}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:231
 #, java-format
 msgid "Invalid spellcheck line: {0}"
-msgstr ""
+msgstr "Ошибка проверки правописания строки: {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:242
@@ -9151,5 +9240,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:332
 msgid "Illegal tag/value combinations"
-msgstr ""
+msgstr "Неправильная комбинация тегов/значений тегов"
 
 #. passing translated text also to original string, as we already
@@ -9174,9 +9263,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:371
 msgid "Invalid white space in property key"
-msgstr ""
+msgstr "Неправильный пробел в названии ключа"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:377
 msgid "Property values start or end with white space"
-msgstr ""
+msgstr "Значение начинается или заканчивается пробелом"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:383
@@ -9187,22 +9276,22 @@
 #, java-format
 msgid "Key ''{0}'' not in presets."
-msgstr ""
+msgstr "Ключа ''{0}'' нет в настройках."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:408
 msgid "Presets do not contain property key"
-msgstr ""
+msgstr "Установки не содержат собственно ключа"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:415
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
-msgstr ""
+msgstr "Значение ''{0}'' для ключа ''{1}'' не установлены заранне."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:416
 msgid "Presets do not contain property value"
-msgstr ""
+msgstr "Не содержит зарание устанвленного значения"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
 msgid "FIXMES"
-msgstr ""
+msgstr "FIXMES"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
@@ -9212,13 +9301,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
 msgid "Validate that property keys are valid checking against list of words."
-msgstr ""
+msgstr "Проверьте, что ключ действителен проверен в отношении списка слов."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Use complex property checker."
-msgstr ""
+msgstr "Использовать сложную проверку"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
 msgid "Validate property values and tags using complex rules."
-msgstr ""
+msgstr "Проверка собственных значений и использование сложных правил тегов."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
@@ -9226,5 +9315,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:530
 msgid "TagChecker source"
-msgstr ""
+msgstr "Исходники TagChecker"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
@@ -9233,4 +9322,6 @@
 "org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
+"Источником (URL или имя файла) проверки правописания (см. http://wiki."
+"openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:552
@@ -9248,25 +9339,27 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:576
 msgid "Check property values."
-msgstr ""
+msgstr "Проверьте правильно значений"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:577
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
+"Проверьте что правильные значения являются действительными в отношении "
+"установок проверки."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584
 msgid "Check for FIXMES."
-msgstr ""
+msgstr "Проверить для FIXMES."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:585
 msgid "Looks for nodes or ways with FIXME in any property value."
-msgstr ""
+msgstr "Ищет узлы или линии с FIXME в свойствах какого-либо значения."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:592
 msgid "Check for paint notes."
-msgstr ""
+msgstr "Проверить заметки."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
 msgid "Check if map painting found data errors."
-msgstr ""
+msgstr "Проверить содержит ли нарисованная карта ошибки данных"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:600
@@ -9276,13 +9369,15 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
 msgid "Use the default data file (recommended)."
-msgstr ""
+msgstr "Используется файл данных установленный по умолчанию"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
 msgid "Use default spellcheck file."
-msgstr ""
+msgstr "Использовать установленный по умолчанию файл проверки правописания"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:605
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
+"Использовать установленный по умолчанию файл проверки правописания "
+"(рекомендуется)"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
@@ -9292,9 +9387,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:807
 msgid "Could not find element type"
-msgstr ""
+msgstr "Не удалось найти тип элемента"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
 msgid "Could not find warning level"
-msgstr ""
+msgstr "Не удалось найти  уровень предупреждения"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:833
@@ -9361,4 +9456,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9440,7 +9541,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "здание"
@@ -9454,5 +9555,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "область"
@@ -9473,22 +9574,22 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:78
 msgid "Way end node near other highway"
-msgstr ""
+msgstr "Последний узел линии рядом с существующим шоссе"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:104
 msgid "Way end node near other way"
-msgstr ""
+msgstr "Последний узел линии рядом с другой линией"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:125
 msgid "Way node near other way"
-msgstr ""
+msgstr "Узел линии рядом с другой линией"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:143
 msgid "Connected way end node near other way"
-msgstr ""
+msgstr "Конечный узел связной линии возле другой линии"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
 msgid "Untagged and unconnected nodes"
-msgstr ""
+msgstr "Непомеченные и не соединённые узлы"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
@@ -9584,4 +9685,27 @@
 "use."
 msgstr ""
+"Вы можете добавлять, редактировать и удалять записи WMS на закладке  "
+"WMSplugin в установках - тогда они будут отображаться в меню WMS.\n"
+"\n"
+"Вы также можете сделать это вручную в Расширенных настройках, используя "
+"следующую схему:\n"
+"wmsplugin.url.1.name=Landsat\n"
+"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+"wmsplugin.url.2.name=NPE Maps... etc\n"
+"\n"
+"Пример полного формата  WMS URL (Landsat)\n"
+"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+"layers=global_mosaic&styles=&srs=EPSG:4326&\n"
+"format=image/jpeg \n"
+"\n"
+"Для карты Metacarta  Rectifier http://labs.metacarta.com/rectifier/, вам "
+"нужно всего лишь ввести соответствующие \"ID\".\n"
+"Чтобы добавить карту Metacarta Rectifier нужно в меню вручную создать URL, "
+"как в этом примере, вместо 73 с ID вашего изображения:\n"
+"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
+"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
+" \n"
+"Примечание: Убедитесь, что изображение согласовано с координатам, если есть "
+"сомнения в лицензионных правах на изображение, то не используйте его."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:54
@@ -9599,14 +9723,14 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:24
 msgid "Metacarta Map Rectifier image id"
-msgstr ""
+msgstr "ID изобрадения карты Metacarta Rectifier"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:32
 #, java-format
 msgid "rectifier id={0}"
-msgstr ""
+msgstr "выпрямитель id={0}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
 msgid "Adjust the position of the selected WMS layer"
-msgstr ""
+msgstr "Отрегулируйте положение выбранного слоя WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
@@ -9616,4 +9740,6 @@
 "This may lead to wrong coordinates."
 msgstr ""
+"Проекция ''{0}'' в URL и текущая проектция ''{1}'' несоответствуют.\n"
+"Это может привести к неправильным координатам."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
@@ -9648,9 +9774,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253
 msgid "Reload erroneous tiles"
-msgstr ""
+msgstr "Перезагрузить ошибочные фрагменты"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271
 msgid "Alpha channel"
-msgstr ""
+msgstr "Альфа канал"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:132
@@ -9694,5 +9820,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Copy Default"
-msgstr ""
+msgstr "Копия поумолчанию"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:101
@@ -9729,4 +9855,9 @@
 #: build/specialmessages.java:9
 msgid "could not get audio input stream from input URL"
+msgstr "не может получить аудио поток из введенного URL"
+
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
 msgstr ""
 
@@ -9737,9 +9868,11 @@
 "import EXIF geotagged pictures."
 msgstr ""
+"Другой геотег плагин для JOSM. Совместите фотографии с GPS треками или "
+"импоруйте геотеги из EXIF фотографий."
 
 #. Plugin cadastre-fr
 #: build/trans_plugins.java:5
 msgid "A special handler for the french land registry WMS server."
-msgstr ""
+msgstr "Особый обработчик на WMS-сервере французского земельного кадастра."
 
 #. Plugin colorscheme
@@ -9752,10 +9885,14 @@
 "true :-)"
 msgstr ""
+"Позволяет пользователю создавать различные цветовые схемы и для "
+"переключаться между ними. Просто измените цвет и создайте новую схему. "
+"Используется для переключения на белом фоне с соответствующими цветами для "
+"большей наглядности при ярком солнечном свете. См. окно настроек JOSM  и  "
+"\"Настройки Карты\" (странно, но это так :-)"
 
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Создание областей"
+msgstr "Создание сетки линий."
 
 #. Plugin DirectUpload
@@ -9765,9 +9902,11 @@
 "openstreetmap.org."
 msgstr ""
+"Этот плагин непосредственно загрузит GPS трек из текущего активного слоя в "
+"JOSM на сайт openstreetmap.org."
 
 #. Plugin Duplicate-Way
 #: build/trans_plugins.java:13
 msgid "Duplicate Ways with an offset"
-msgstr ""
+msgstr "Дублирующиеся линии со смещением"
 
 #. Plugin editgpx
@@ -9778,4 +9917,7 @@
 "eg. deleting uninteresting parts of track."
 msgstr ""
+"Главная особенность плагина является возможность удаления точек на GPX "
+"треке. Этот плагин может быть использован для подготовки треков для загрузки "
+"на OSM. Например, удалить неинтересные части трека."
 
 #. Plugin globalsat
@@ -9783,9 +9925,11 @@
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
+"Получить GPS точки со спутника GlobalSat dg100 Data Logger непосредственно в "
+"JOSM."
 
 #. Plugin grid
 #: build/trans_plugins.java:19
 msgid "Provide a background layer that displays a map grid"
-msgstr ""
+msgstr "Предоставлен фоновый слой который отображает сетку на карте"
 
 #. Plugin ImageWayPoint
@@ -9796,9 +9940,12 @@
 "the filename of an image."
 msgstr ""
+"Другой плагин для совмещения изображения на путевых точки их GPX трека. И "
+"совпадение делается когда аттрибуты 'имя', 'cmt' или 'описание' в теге точки "
+"совпадает с именем файла изображения."
 
 #. Plugin lakewalker
 #: build/trans_plugins.java:23
 msgid "Helps vectorizing WMS images."
-msgstr ""
+msgstr "Помогите векторизации WMS изображений."
 
 #. Plugin livegps
@@ -9807,4 +9954,5 @@
 "Support live GPS input (moving dot) through a connection to gpsd server."
 msgstr ""
+"Поддержка GPS ввода (движение точки) с помощью подключения к серверу gpsd."
 
 #. Plugin measurement
@@ -9815,4 +9963,7 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
+"Обеспечивает измерение диалога и слоя для измерения длины и угла сегмента, "
+"района вокруг себя (простых) замкнутых лини и создание измереного пути "
+"(которые также могут быть импортированы из GPS слой)."
 
 #. Plugin nearclick
@@ -9823,14 +9974,17 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
+"Имитирует щелчок, когда вы делаете нажатие и недалеко перетаскиваете. Это "
+"полезно для ручки планшета, когда у вас есть проблемы, то просто нажав на "
+"ручке без перемещения мыши (основная Java-планшет проблема)."
 
 #. Plugin openlayers
 #: build/trans_plugins.java:31
 msgid "Displays an OpenLayers background image"
-msgstr ""
+msgstr "Отобразить фоновый рисунок OpenLayers"
 
 #. Plugin openstreetbugs
 #: build/trans_plugins.java:33
 msgid "Imports issues from OpenStreetBugs"
-msgstr ""
+msgstr "Импорт вопросов из OpenStreetBugs"
 
 #. Plugin openvisible
@@ -9839,4 +9993,6 @@
 "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
+"Позволяет открывать GPX/OSM файлы, которые пересекаются c границами текущего "
+"экрана"
 
 #. Plugin osmarender
@@ -9844,40 +10000,49 @@
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
+msgstr "Запуск FireFox для отображения текущего вида как SVG изображения."
+
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
 msgstr ""
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
-msgstr ""
+msgstr "Великолепный JGoodies Пластиковый Скин."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
-msgstr ""
+msgstr "Разрешить другим приложениям посылать команды JOSM."
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Предоставляет возможности маршрутизации."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
 "background and request updates."
 msgstr ""
+"Отображает простую карту в JOSM. Можно загрузить изображения карты в "
+"качестве фона и обновлять их."
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
-msgstr ""
+msgstr "Разрешить добавить теги/узлы на текущей GPS позиции."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
+msgstr "Показывает окно для редактирования тегов в табличной сетке."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9885,41 +10050,55 @@
 "the jar-file as standalone as well."
 msgstr ""
+"Добавляет предустановленные теги к меню помощи, которое поможет вам "
+"разработке предустановленных тегов (быстрый просмотр в диалоге, который "
+"появляется во всплывающем окне). Вы можете запустить JAR-файл в автономном "
+"режиме."
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
-msgstr ""
+msgstr "Прямо загрузить TCX файлы из JOSM."
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
-msgstr ""
+msgstr "Сделать ряд домов вдоль улицы из одного блока."
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
 "user, opens browser showing selected author profile page."
 msgstr ""
+"Инструменты для работы с авторами / пользователями. Выбирайте данные на "
+"карте, которые принадлежат отдельным пользователем, откроется браузер со "
+"страницей профиля выбранного автора."
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
 "jump to position."
 msgstr ""
+"Несколько утилит, которые делают вашу жизнь проще: например, упростить "
+"линию, объединить районы, переход на позиции."
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
 "for the common ones. Spellcheck integrated for tag names."
 msgstr ""
+"Инспектор OSM данных. Он проверяет наличие проблем в данных, а также "
+"предлагает исправить некоторые известные общие проблемы. Проверяет "
+"правописание для комплексных имён тегов."
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
 msgstr ""
+"Показать географически привязанные изображения в качестве фона в JOSM (WMS "
+"серверов Yahoo, ...)."
 
 #. <!--
@@ -10006,5 +10185,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Сноска"
@@ -10059,7 +10238,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Слой"
@@ -10102,5 +10281,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорость (км/ч)"
@@ -10148,5 +10327,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Односторонняя"
@@ -10202,5 +10381,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Мост"
@@ -10250,5 +10429,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Тоннель"
@@ -10295,7 +10474,7 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
-msgstr ""
+msgstr "Отсечь"
 
 #. item "Streets/Motorway" check "Cutting"
@@ -10340,7 +10519,7 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
-msgstr ""
+msgstr "Насыпь"
 
 #. item "Streets/Motorway" check "Embankment"
@@ -10496,8 +10675,8 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
-msgstr ""
+msgstr "Ширина (метры)"
 
 #. item "Streets/Unclassified" text "Width (meters)"
@@ -10544,5 +10723,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Дорожное покрытие"
@@ -10574,5 +10753,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "асфальтированная"
@@ -10583,5 +10762,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "неасфальтированная"
@@ -10595,5 +10774,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "мостовая"
@@ -10631,18 +10810,18 @@
 #: build/trans_presets.java:257
 msgid "Serviceway type"
-msgstr ""
+msgstr "Тип служебного проезда"
 
 #. item "Streets/Service" combo "Serviceway type"
 #: build/trans_presets.java:257
 msgid "alley"
-msgstr ""
+msgstr "Аллея"
 
 #: build/trans_presets.java:257
 msgid "driveway"
-msgstr ""
+msgstr "проезд"
 
 #: build/trans_presets.java:257
 msgid "parking_aisle"
-msgstr ""
+msgstr "парковочный проезд"
 
 #. item "Streets/Service" text "Width (meters)"
@@ -10658,5 +10837,5 @@
 #: build/trans_presets.java:274
 msgid "Edit Parking Aisle"
-msgstr ""
+msgstr "Изменить автомобильный проезд"
 
 #. </optional>
@@ -10745,5 +10924,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10764,6 +10943,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "да"
@@ -10907,7 +11086,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "нет"
@@ -10921,73 +11100,63 @@
 msgstr "Грузовик (более 3.5т)"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Лошадь"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Мотоцикл"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Автомобиль"
@@ -10995,5 +11164,5 @@
 #: build/trans_presets.java:316
 msgid "Public Service Vehicles (psv)"
-msgstr ""
+msgstr "Транспортные средства общего пользования"
 
 #: build/trans_presets.java:317
@@ -11019,15 +11188,15 @@
 #: build/trans_presets.java:322
 msgid "Max. Height (meters)"
-msgstr ""
+msgstr "Макс. Высота (метры)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
 #: build/trans_presets.java:323
 msgid "Max. Width (meters)"
-msgstr ""
+msgstr "Макс. Ширина (метры)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
 #: build/trans_presets.java:324
 msgid "Max. Length (meters)"
-msgstr ""
+msgstr "Макс. Длина (метры)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
@@ -11062,130 +11231,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Тип"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11193,5 +11250,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11199,11 +11256,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11211,5 +11262,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11217,5 +11268,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11223,5 +11274,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11229,6 +11280,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11247,6 +11304,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "Автобан"
@@ -11272,6 +11329,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "Автострада"
@@ -11297,6 +11354,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "Основная"
@@ -11322,6 +11379,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "Вторичная"
@@ -11335,5 +11392,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "Третичная"
@@ -11341,5 +11398,5 @@
 #: build/trans_presets.java:334
 msgid "unclassified"
-msgstr ""
+msgstr "Неклассифицировано"
 
 #. color green
@@ -11351,5 +11408,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "местного значения"
@@ -11367,5 +11424,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "Служебная"
@@ -11373,5 +11430,5 @@
 #: build/trans_presets.java:334
 msgid "bus_guideway"
-msgstr ""
+msgstr "Автобусная дорога"
 
 #. color turningcircle
@@ -11392,6 +11449,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "Строительство"
@@ -11409,5 +11466,5 @@
 #: build/trans_presets.java:364
 msgid "Edit Tunnel"
-msgstr ""
+msgstr "Редактировать Тоннель"
 
 #. item "Streets/Tunnel" text "Width (meters)"
@@ -11432,6 +11489,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11442,5 +11498,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "Круг"
@@ -11451,5 +11507,5 @@
 #: build/trans_presets.java:402
 msgid "Bridleway"
-msgstr ""
+msgstr "Дорога для всадников"
 
 #. item
@@ -11457,5 +11513,5 @@
 #: build/trans_presets.java:404
 msgid "Edit Bridleway"
-msgstr ""
+msgstr "Редактировать дорогу для всадников"
 
 #. item "Ways/Bridleway" text "Width (meters)"
@@ -11784,14 +11840,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Оператор"
@@ -11816,35 +11872,35 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
-msgstr ""
+msgstr "неуправляемый"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
-msgstr ""
+msgstr "Светофор"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
-msgstr ""
+msgstr "остров"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
-msgstr ""
+msgstr "Необозначенный"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
-msgstr ""
+msgstr "Пересечение с дорогой для всадников"
 
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
-msgstr ""
+msgstr "Пересечение с велодорожкой"
 
 #. item "Waypoints/Traffic Signal" check "Cross by bicycle"
@@ -11852,12 +11908,12 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
-msgstr ""
+msgstr "Пересекая сопутствующие"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
 #: build/trans_presets.java:758
 msgid "Crossing type name (UK)"
-msgstr ""
+msgstr "Имя типа пересечения (Великобритания)"
 
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
@@ -11865,25 +11921,25 @@
 #: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "zebra"
-msgstr ""
+msgstr "Зебра"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "pelican"
-msgstr ""
+msgstr "Пеликан"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "toucan"
-msgstr ""
+msgstr "Тукан"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "puffin"
-msgstr ""
+msgstr "Тупик (птица)"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "pegasus"
-msgstr ""
+msgstr "Пегас"
 
 #: build/trans_presets.java:758 build/trans_presets.java:773
 msgid "tiger"
-msgstr ""
+msgstr "Тигр"
 
 #. </optional>
@@ -11903,14 +11959,14 @@
 #: build/trans_presets.java:767
 msgid "Edit Crossing"
-msgstr ""
+msgstr "Редактирование пересечения"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
 #: build/trans_presets.java:773
 msgid "Type name (UK)"
-msgstr ""
+msgstr "Имя типа (UK)"
 
 #: build/trans_presets.java:775
 msgid "Mini-roundabout"
-msgstr ""
+msgstr "Мини-круг"
 
 #. item
@@ -11921,14 +11977,14 @@
 #: build/trans_presets.java:780
 msgid "Direction"
-msgstr ""
+msgstr "Направление"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
 #: build/trans_presets.java:780
 msgid "clockwise"
-msgstr ""
+msgstr "по часовой стрелке"
 
 #: build/trans_presets.java:782
 msgid "Turning Circle"
-msgstr ""
+msgstr "Круг для разворота"
 
 #. item
@@ -11965,5 +12021,5 @@
 #: build/trans_presets.java:801
 msgid "Incline"
-msgstr ""
+msgstr "Подъём"
 
 #. item
@@ -11971,5 +12027,5 @@
 #: build/trans_presets.java:804
 msgid "Incline Steep"
-msgstr ""
+msgstr "Крутой подъём"
 
 #. item
@@ -11999,10 +12055,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Возвышение"
@@ -12015,29 +12072,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Столбик"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Править столбик"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12046,7 +12092,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12055,106 +12104,142 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Разрешено движение:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Столбик"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr "Преграда для велосипедов"
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Бетонный блок"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Забор препятствующий выходу скота с пастбища на дорогу"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Редактировать Забор препятствующий выходу скота с пастбища на дорогу"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
 #: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Править столбик"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Подъёмный мост"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Править подъёмный мост"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
 msgid "Bus Trap"
-msgstr ""
+msgstr "Автобусное место"
 
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr ""
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:864
 msgid "Spikes"
 msgstr "Шипы"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:865
 msgid "Edit Spikes"
-msgstr ""
+msgstr "Редактировать выступ"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Опускающаяся решётка"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Править опускающуюся решётку"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Оплата проезда"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Править пункт оплаты проезда"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Пограничный контороль"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Править пограничный контороль"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Живая изгородь"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Забор"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Стена"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Городская стена"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Подпорная стена"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Вход"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Править вход"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "Ворота"
@@ -12162,128 +12247,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr "Править ворота"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr "Править шлагбаум"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Ворота Гэмпшир"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Редактировать Ворота Гэмпшир"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Портовые ворота"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Редактировать Портовые ворота"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr "Узкая калитка"
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr "Редактировать Узкая калитка"
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "ступеньки для перехода через ограждение"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Редактировать ступеньки для перехода через ограждение"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Двойные ворота"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Править двойные ворота"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Живая изгородь"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Забор"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Бетонный блок"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Стена"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Городская стена"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Подпорная стена"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Оплата проезда"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Править пункт оплаты проезда"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Пограничный контороль"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Править пограничный контороль"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Вход"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Править вход"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Источник"
@@ -12291,5 +12328,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Править источник"
@@ -12297,5 +12334,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Водосток"
@@ -12303,10 +12340,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Править водосток"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Ручей"
@@ -12314,10 +12351,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Править ручей"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Канал"
@@ -12325,10 +12362,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Править канал"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Река"
@@ -12338,5 +12375,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Править реку"
@@ -12344,15 +12381,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Править воду"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Суша"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Править сушу"
@@ -12360,15 +12397,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Бассейн"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Резервуар"
@@ -12376,15 +12413,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Крытый резервуар"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Править крытый резервуар"
@@ -12392,5 +12429,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Берег реки"
@@ -12399,10 +12436,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Править берег реки"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Заболоченная территория"
@@ -12413,56 +12450,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Редактировать заболоченная территория"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "болото"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "трясина"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
-msgstr ""
-
-#: build/trans_presets.java:1121
+msgstr "Болото"
+
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "плавни"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "солевое болото"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "ватты"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "мангры"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Грязь"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Править грязь"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Пляж"
@@ -12470,20 +12507,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Править пляж"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Бухта"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Править бухту"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Скала"
@@ -12491,10 +12528,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Править скалу"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Побережье"
@@ -12502,5 +12539,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Править побережье"
@@ -12508,5 +12545,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Паромная переправа"
@@ -12514,5 +12551,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Править переправу"
@@ -12521,5 +12558,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Лодочная мастерская"
@@ -12527,10 +12564,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Править лодочную мастерскую"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Причал"
@@ -12538,5 +12575,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Править причал"
@@ -12544,5 +12581,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Дамба"
@@ -12550,15 +12587,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Править дамбу"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Гидротехнические сооружения"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Ворота шлюза"
@@ -12567,5 +12604,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Водослив"
@@ -12573,20 +12610,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Править водослив"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Править водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Разворот"
@@ -12595,15 +12632,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Пристань для яхт"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Править пристань для яхт"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Пирс"
@@ -12611,10 +12648,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Править пирс"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Паромная станция"
@@ -12622,10 +12659,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Править паромную станцию"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Слип"
@@ -12635,5 +12672,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Править слип"
@@ -12641,10 +12678,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Железная дорога"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Железная дорога"
@@ -12652,5 +12689,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Править железную дорогу"
@@ -12680,8 +12717,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Необязательные типы"
@@ -12695,35 +12732,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+msgstr "сад"
+
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+msgstr "запасный путь"
+
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1242
+msgstr "ответвление"
+
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Узкоколейка"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Править узкоколейку"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Монорельс"
@@ -12731,45 +12768,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Править монорельс"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Историческая"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Править историческую дорогу"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Лёгкая железная дорога"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Править лёгкую железную дорогу"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Метрополитен"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Править метрополитен"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Трамвай"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Править трамвай"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Направляемый автобус"
@@ -12777,5 +12814,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Править рельсовый автобус"
@@ -12784,14 +12821,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Неиспользуемая"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Править неиспользуемую дорогу"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Заброшенная"
@@ -12800,14 +12837,14 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
-msgstr "Регулируемый переезд"
+msgstr "Переезд"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
-msgstr "Переезд"
+msgstr "Пересечение"
 
 #. item
@@ -12815,11 +12852,11 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
-msgstr ""
+msgstr "Тип пересечения"
 
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Поворотный стол"
@@ -12828,10 +12865,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Надземные пути"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Кресельная дорога"
@@ -12839,10 +12876,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Править кресельную дорогу"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Бугельный подъёмник"
@@ -12850,10 +12887,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Править бугельный подъёмник"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Канатная дорога"
@@ -12861,24 +12898,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Править канатную дорогу"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Править гольф"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Станция"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Править станцию"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Заправка"
@@ -12888,5 +12938,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Править заправку"
@@ -12902,5 +12952,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12910,5 +12960,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Править стоянку"
@@ -12916,40 +12966,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
-msgstr ""
+msgstr "Вместимость"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "наземная"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "многоуровневая"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "подземная"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "перехватывающая"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Места для инвалидов"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
-msgstr ""
+msgstr "Денежный сбор"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Мойка"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Править автомойку"
@@ -12957,5 +13008,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Магазин"
@@ -12963,15 +13014,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Править автомагазин"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Мастерская"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Править автомастерскую"
@@ -12979,5 +13030,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Прокат"
@@ -12986,10 +13037,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Править прокат авто"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Совместное использование"
@@ -12997,5 +13048,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Править совместное использование"
@@ -13003,5 +13054,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Править стоянку для велосипедов"
@@ -13010,5 +13061,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Править прокат велосипедов"
@@ -13017,21 +13068,21 @@
 #. <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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Править веломастерскую"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Общественный транспорт"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
-msgstr ""
+msgstr "UIC-Справка"
 
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Полустанок"
@@ -13039,5 +13090,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Править полустанок"
@@ -13045,5 +13096,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Трамвайная остановка"
@@ -13052,5 +13103,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Править трамвайную остановку"
@@ -13058,5 +13109,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Ж/Д платформа"
@@ -13065,5 +13116,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Править ж/д платформу"
@@ -13075,16 +13126,16 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
-msgstr ""
+msgstr "Справка (номер платформы)"
 
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Область"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -13093,10 +13144,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Править вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Кресло-каталка"
@@ -13105,5 +13156,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Автовокзал"
@@ -13112,5 +13163,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Править автовокзал"
@@ -13118,5 +13169,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Автобусная остановка"
@@ -13126,5 +13177,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Править автобусную остановку"
@@ -13132,10 +13183,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Автобусная платформа"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Править автобусную платформу"
@@ -13143,5 +13194,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Такси"
@@ -13149,5 +13200,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Править стоянку такси"
@@ -13155,5 +13206,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Аэропорт"
@@ -13161,15 +13212,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
-msgstr ""
+msgstr "Редактировать Аэродром"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "Международная ассоциация воздушного транспорта"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "Международная организация гражданской авиации"
@@ -13178,5 +13229,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Проживание"
@@ -13188,5 +13239,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Гостиница"
@@ -13195,15 +13246,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Править гостиницу"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Звёзды"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Мотель"
@@ -13211,31 +13262,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Править иотель"
 
 #. item "Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1543
+msgid "Guest House"
+msgstr "Домик для гостей"
+
+#. item
+#: build/trans_presets.java:1544
+msgid "Edit Guest House"
+msgstr "Редактировать Домик для гостей"
+
+#. item "Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1548
+msgid "Chalet"
+msgstr "Дача/Коттедж"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #: build/trans_presets.java:1550
-msgid "Guest House"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1551
-msgid "Edit Guest House"
-msgstr ""
-
-#. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
-msgid "Chalet"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
 msgid "Edit Chalet"
-msgstr ""
+msgstr "Редактировать Дача/Коттедж"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Студенческое общежитие"
@@ -13243,30 +13294,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Править студенческое общежитие"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1568
+msgstr "Альпийский шалаш"
+
+#. item
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
-msgstr ""
+msgstr "Редактировать Альпийский шалаш"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Площадка для домов на колёсах"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Править площадку для домов на колёсах"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Кэмпинг"
@@ -13274,10 +13325,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Править кэмпинг"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Питание"
@@ -13288,5 +13339,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -13294,5 +13345,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Править ресторан"
@@ -13300,5 +13351,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Кухня"
@@ -13306,61 +13357,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "итальянская"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "китайская"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "пицца"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "бургеры"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "греческая"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "немецкая"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "индийская"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "местная"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "турецкая"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "азиатская"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "тайская"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "мексиканская"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "японская"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Фастфуд"
@@ -13368,9 +13419,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Правка фастфуда"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Кафе"
@@ -13378,10 +13429,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Править кафе"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Бар"
@@ -13389,31 +13440,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Править бар"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Пивная"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Править пивную"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
-msgstr ""
+msgstr "Закусочная"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
-msgstr ""
+msgstr "Редактировать Закусочная"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Ночной клуб"
@@ -13421,20 +13472,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Править ночной клуб"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Достопримечательность"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Править достопримечательность"
@@ -13443,22 +13494,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Часы работы"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "Музей"
@@ -13466,10 +13506,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "Править музей"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -13478,10 +13518,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "Править зоопарк"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "Смотровая площадка"
@@ -13489,25 +13529,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr "Править смотровую площадку"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr "Каланча"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr "Парк развлечений"
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr "Править парк развлечений"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "Рисунки"
@@ -13515,5 +13555,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr "Редактировать рисунки"
@@ -13521,77 +13561,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
-msgstr ""
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr "Справочное бюро"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
+msgstr "Править справочное бюро"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
-msgstr ""
+msgstr "Тип карты"
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "карта"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "карта города"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "карта туристических маршрутов"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "карта велодорожек"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
-msgstr ""
+msgstr "Ближайшее описание"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
-msgstr ""
+msgstr "Информационный стенд"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
-msgstr ""
+msgstr "Тип Инфорационного Щита"
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr "доска информации"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr "животный мир"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr "Столб с указателями (туризм)"
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
-msgstr ""
+msgstr "Другие Информационные точки"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Навес"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Править навес"
@@ -13599,25 +13651,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Очаг"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Место для пикника"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Править место для пикника"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Исторические места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Замок"
@@ -13626,20 +13678,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Править замок"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Руины"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Править руины"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Место раскопок"
@@ -13648,31 +13700,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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Править место раскопок"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
-msgid "Monument"
-msgstr "Монумент"
-
-#. item
-#: build/trans_presets.java:1736
-msgid "Edit Monument"
-msgstr "Править монумент"
-
-#. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
-msgid "Memorial"
-msgstr "Памятник"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
-msgid "Edit Memorial"
-msgstr "Править памятник"
-
-#. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1731
 msgid "Battlefield"
 msgstr "Поле битвы"
@@ -13680,45 +13711,67 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1733
 msgid "Edit Battlefield"
 msgstr "Править поле битвы"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#. <separator/>
+#: build/trans_presets.java:1738
+msgid "Monument"
+msgstr "Памятник"
+
+#. item
+#: build/trans_presets.java:1739
+msgid "Edit Monument"
+msgstr "Править памятник"
+
+#. item "Historic Places/Monument" text "Name"
+#: build/trans_presets.java:1743
+msgid "Memorial"
+msgstr "Мемориал"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
+#: build/trans_presets.java:1745
+msgid "Edit Memorial"
+msgstr "Править мемориал"
+
+#. item "Historic Places/Memorial" text "Name"
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Править придорожный крест"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Править придорожную святыню"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Править аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -13726,15 +13779,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Править игровую площадку"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Рыбалка"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Править рыбалку"
@@ -13742,15 +13795,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Спортивные учреждения"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Править стадион"
@@ -13764,6 +13817,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -13842,4 +13895,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14131,28 +14192,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "спорт"
@@ -14162,227 +14224,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "несколько"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
-msgstr ""
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "ж/д пути"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
-msgstr ""
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "изгибаться"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "каноэ"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "альпинизм"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
-msgstr ""
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "крикет_сеть"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
-msgstr ""
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "крокет"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
-msgstr ""
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "наездник"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "хоккей"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
-msgstr ""
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "машина"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
-msgstr ""
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "пелота"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
-msgstr ""
-
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+msgstr "производить шум"
+
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "рэгби"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "стрельба"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "фигурное катание"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "плаванье"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "теннис"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Править спортивный центр"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1802
+msgstr "Спортивное поле"
+
+#. item
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
-msgstr ""
-
-#: build/trans_presets.java:1810
+msgstr "Править спортивное поле"
+
+#: build/trans_presets.java:1807
 msgid "Racetrack"
-msgstr "Трэк"
-
-#. item
-#: build/trans_presets.java:1811
+msgstr "Трек"
+
+#. item
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
-msgstr "Править трэк"
-
-#: build/trans_presets.java:1819
+msgstr "Править трек"
+
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Править поле для гольфа"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Минигольф"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Править минигольф"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Несколько"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Править несколько видов спорта"
@@ -14421,191 +14483,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
-msgstr ""
-
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+msgstr "спортивное поле"
+
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "10штырьковый"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
-msgstr ""
-
-#: build/trans_presets.java:1843
+msgstr "Редактировать 10 пин"
+
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Править атлетику"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Править стрельбу из лука"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Скалолазанье"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Править скалолазанье"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Каноэ"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Править каноэ"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Велоспорт"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Править велоспорт"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Править собачьи бега"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1880
+msgstr "Наездник"
+
+#. item
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
-msgstr ""
-
-#: build/trans_presets.java:1885
+msgstr "Редактировать Наездник"
+
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Править гимнастику"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Моторные виды спорта"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Править моторные виды спорта"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Править фигурное катание"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Править скейтборд"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Плаванье"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Править плаванье"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Лыжный спорт"
@@ -14613,56 +14675,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Править лыжный сопрт"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
-msgstr ""
+msgstr "Тип лыжня"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
-msgstr ""
-
-#: build/trans_presets.java:1926
+msgstr "спуск"
+
+#: build/trans_presets.java:1923
 msgid "nordic"
-msgstr ""
-
-#: build/trans_presets.java:1926
+msgstr "лыжный спорт"
+
+#: build/trans_presets.java:1923
 msgid "snow_park"
-msgstr ""
-
-#: build/trans_presets.java:1927
+msgstr "снежный городок"
+
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "новичок"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "средний"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "продвинутый"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "эксперт"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "свободный"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "Стрельба"
@@ -14670,178 +14734,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Править стрельбу"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Править футбол"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Американский футбол"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Править американский футбол"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Править австралийский футбол"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Править бейсбол"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Править баскетбол"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Гольф"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Править гольф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1976
+msgstr "Рубин"
+
+#. item
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
-msgstr ""
-
-#: build/trans_presets.java:1981
+msgstr "Редактировать Рубин"
+
+#: build/trans_presets.java:1978
 msgid "Bowls"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1982
+msgstr "Стадион"
+
+#. item
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
-msgstr ""
-
-#: build/trans_presets.java:1987
+msgstr "Редактировать Стадион"
+
+#: build/trans_presets.java:1984
 msgid "Cricket"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1988
+msgstr "Крикет"
+
+#. item
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
-msgstr ""
-
-#: build/trans_presets.java:1993
+msgstr "Редактировать Крикет"
+
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1994
+msgstr "Крикет сети"
+
+#. item
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
-msgstr ""
-
-#: build/trans_presets.java:1999
+msgstr "Редактировать Крикет сети"
+
+#: build/trans_presets.java:1996
 msgid "Croquet"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2000
+msgstr "Крокет"
+
+#. item
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
-msgstr ""
-
-#: build/trans_presets.java:2005
+msgstr "Редактировать Крокет"
+
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Править хоккей"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2012
+msgstr "Пелота"
+
+#. item
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
-msgstr ""
-
-#: build/trans_presets.java:2017
+msgstr "Редактировать Пелота"
+
+#: build/trans_presets.java:2014
 msgid "Racquet"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2018
+msgstr "Ракетка"
+
+#. item
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
-msgstr ""
-
-#: build/trans_presets.java:2023
+msgstr "Редактировать Ракетка"
+
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Регби"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Править рэгби"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Править настольный теннис"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Править теннис"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Здания"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Здание"
@@ -14849,5 +14913,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -14855,10 +14919,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Править общественное здание"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -14866,10 +14930,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Править здание муниципалитета"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Посольство"
@@ -14877,10 +14941,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Править посольство"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Здание суда"
@@ -14889,10 +14953,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Править здание суда"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Тюрьма"
@@ -14901,10 +14965,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Править тюрьму"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -14914,10 +14978,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Править полицию"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -14926,10 +14990,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Править пожарное депо"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -14937,5 +15001,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Править почтовое отделение"
@@ -14943,15 +15007,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Править детсад"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Школа"
@@ -14959,10 +15023,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Править школу"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Университет"
@@ -14970,10 +15034,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Править университет"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Колледж"
@@ -14981,5 +15045,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Править колледж"
@@ -14987,5 +15051,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -14994,10 +15058,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Править кинотеатр"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Библиотека"
@@ -15006,10 +15070,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Править библиотеку"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -15017,10 +15081,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Править центр искусств"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Театр"
@@ -15029,10 +15093,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Править театр"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Место поклонения"
@@ -15042,5 +15106,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Править место поклонения"
@@ -15049,6 +15113,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Религия"
@@ -15057,66 +15121,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "Буддизм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "Христианство"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "Индуизм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "Джайнизм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "Иудаизм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "Мусульманство"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "Спиритуализм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "Даосизм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "унитаризм"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Конфессия"
@@ -15125,81 +15190,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "Англиканская"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "Баптизм"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "Католическая"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "Евангельская"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "Свидетели Иеговы"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "Методизм"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "Мормон"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+msgstr "пятидесятник"
+
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+msgstr "пресвитерианин"
+
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "Протестантизм"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
-msgstr ""
-
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+msgstr "квакер"
+
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "шиизм"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "суннизм"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Адреса"
@@ -15208,5 +15273,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Править адреса"
@@ -15214,5 +15279,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Номер дома"
@@ -15220,20 +15285,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Название города"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Код страны"
@@ -15241,5 +15306,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -15248,5 +15313,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Править интерполяцию адресов"
@@ -15254,67 +15319,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "нечётные"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "все"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "атлетика"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Цеха"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Править цеха"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Башня"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Править башню"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Править водонапорную башню"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Править газгольдер"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -15322,10 +15392,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Править маяк"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -15333,10 +15403,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Править ветряную мельницу"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -15344,10 +15414,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Править трубопровод"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -15357,10 +15427,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Править очистные сооружения"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Кран"
@@ -15368,10 +15438,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Править кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Буй"
@@ -15379,10 +15449,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Править буй"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Точка наблюдений"
@@ -15390,10 +15460,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Править точку наблюдений"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -15401,5 +15471,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Править видеонаблюдение"
@@ -15407,7 +15477,7 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
-msgstr "Генератор энергии"
+msgstr "Электростанция"
 
 #. item
@@ -15415,69 +15485,69 @@
 #. 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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
-msgstr "Править генератор энергии"
+msgstr "Править электростанцию"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "энергия ветра"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "энергия воды"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "энергия сгорания топлива"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "атомный"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "уголь"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "энергия солнца"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "газ"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
-msgstr "Электростанция"
+msgstr "Электроподстанция"
 
 #. item
 #. <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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
-msgstr "Править электростанцию"
+msgstr "Править электроподстанцию"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
-msgstr "Электроподстанция"
+msgstr "Трансформаторная будка"
 
 #. item
 #. <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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
-msgstr "Править подстанцию"
+msgstr "Править трансформатор"
 
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
-msgstr ""
+msgstr "электролиния"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -15488,5 +15558,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Править опору ЛЭП"
@@ -15494,5 +15564,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -15501,25 +15571,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Править линию электропередач"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Напряжение"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Количество кабелей"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Туалеты"
@@ -15527,25 +15597,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
-msgstr ""
-
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr ""
+msgstr "Справочный номер"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Телефон"
@@ -15554,5 +15619,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Править телефон"
@@ -15560,5 +15625,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Монеты"
@@ -15566,5 +15631,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Банкноты"
@@ -15572,5 +15637,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -15578,5 +15643,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Дебитные карты"
@@ -15584,15 +15649,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Переработка отходов"
@@ -15601,5 +15666,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Править переработку отходов"
@@ -15607,35 +15672,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Консервные банки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Скамейка"
@@ -15644,43 +15709,43 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Охотничий стенд"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Править охотничий стенд"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
-msgstr ""
+msgstr "Укрытие"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
-msgstr ""
+msgstr "Заблокирован"
 
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "низкий"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "средний"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "полный"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Фонтан"
@@ -15689,10 +15754,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Править фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -15701,36 +15766,36 @@
 #. <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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Править источник воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
-msgstr ""
+msgstr "Детская комната"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
-msgstr ""
+msgstr "Редактировать Детская комната"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Магазины"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Править супермаркет"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Продуктовый магазин"
@@ -15738,10 +15803,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Править продуктовый магазин"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Киоск"
@@ -15749,10 +15814,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Править киоск"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -15760,5 +15825,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Править торговый автомат"
@@ -15766,88 +15831,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
-msgstr ""
-
-#: build/trans_presets.java:2396
+msgstr "план общественного транспорта"
+
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "билеты на парковку"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "еда"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2396
+msgstr "телефонные ваучеры"
+
+#: build/trans_presets.java:2393
 msgid "vouchers"
-msgstr ""
-
-#: build/trans_presets.java:2396
+msgstr "ваучеры"
+
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "презервативы"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "тампоны"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
-msgstr ""
+msgstr "Счета или карты лояльности"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Мясная лавка"
@@ -15855,10 +15920,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Править мясную лавку"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Булочная"
@@ -15866,10 +15931,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Править булочную"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Флорист"
@@ -15877,92 +15942,106 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Редактировать флориста"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2426
+msgstr "Цветочный"
+
+#. item
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
-msgstr ""
+msgstr "Редактировать Цветочный Магазин"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Школа"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Редактировать обувной магазин"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Редактировать магазин напитков"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Компьютер"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Редактировать магазин компьютеров"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Электроника"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
-msgstr ""
+msgstr "Редактиновать Магазан электрнонной техники"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2446
+msgstr "Звуковая аппаратура"
+
+#. item
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
-msgstr ""
+msgstr "Редактировать Магазин звуковой аппаратуры"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Мебельный"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Править мебельный магазин"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
-msgstr ""
+msgstr "Садовый магазин"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
-msgstr ""
+msgstr "Редактировать Садовый магазин"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
-msgstr ""
+msgstr "Оборудование"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
-msgstr ""
+msgstr "Редактировать Магазин оборудования"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Строительный магазин"
@@ -15970,60 +16049,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "Править строительный магазин"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2474
+msgstr "Канцтовары"
+
+#. item
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
-msgstr ""
+msgstr "Редактировать Магазин Канцтоваров"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Править парихмахерскую"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Обувь"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Редактировать обувной магазин"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Игрушки"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Редактировать магазин игрушек"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2494
+msgstr "Видео"
+
+#. item
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
-msgstr ""
+msgstr "Редактировать Магазин видеозаписей"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Химчистка"
@@ -16031,10 +16110,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Править химчистку"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Прачечная"
@@ -16042,10 +16121,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Править прачечную"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
@@ -16053,35 +16132,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Править магазин товаров для активного отдыха"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Спорт"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
-msgstr ""
-
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+msgstr "Редактировать Спортивный магазин"
+
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "оптика"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Править оптику"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Наличные"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Банк"
@@ -16089,5 +16170,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Править банк"
@@ -16095,10 +16176,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -16106,5 +16187,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Править обмен валют"
@@ -16112,15 +16193,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Править банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Здоровье"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Врач"
@@ -16128,20 +16209,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Править врача"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Править стоматологию"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -16149,5 +16230,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Править аптеку"
@@ -16155,10 +16236,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Больница"
@@ -16166,10 +16247,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Править больницу"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "Пункт вызова экстренной помощи"
@@ -16178,5 +16259,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "Править пункт вызова экстренной помощи"
@@ -16185,20 +16266,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
-msgstr ""
+msgstr "Название точки"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Номер телефона"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, как например +12-345-67890)"
@@ -16206,5 +16287,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -16213,25 +16294,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Править ветеринара"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Континент"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Править континент"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Страна"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Править страну"
@@ -16239,45 +16320,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Штат"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Править штат"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Область"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Править область"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Графство"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Править графство"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Править город"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -16285,10 +16367,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Править город"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Пригород"
@@ -16296,30 +16378,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Править пригород"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Село"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Править село"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Править деревню"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Местность"
@@ -16327,10 +16410,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Править местность"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Остров"
@@ -16338,5 +16421,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Править остров"
@@ -16344,5 +16427,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -16350,10 +16433,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Править вход в пещеру"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Вершина"
@@ -16361,10 +16444,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Править вершину"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Ледник"
@@ -16372,10 +16455,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Править ледник"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Вулкан"
@@ -16383,70 +16466,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Править вулкан"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Государственная"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Править государственную границу"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Административная"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Править административную границу"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Править гражданскую границу"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2722
+msgstr "Политическая"
+
+#. item
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Править политическую границу"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2728
+msgstr "Национальный парк"
+
+#. item
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Править национальный парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Дерево"
@@ -16455,15 +16538,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Править дерево"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Лесистая местность"
@@ -16472,5 +16555,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Править лесистую местность"
@@ -16478,17 +16561,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Лес"
@@ -16497,19 +16580,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Править лес"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Править заповедник"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Каменистая осыпь"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Редактировать Каменистая осыпь"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Кустарник"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Редактировать Кустарник"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Вырубленный лес"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Редактировать Вырубленный лес"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Пустошь"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Редактировать Здоровье"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -16518,81 +16645,82 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Править двор фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Обрабатываемая земля"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Править обрабатываемую землю"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2782
+msgstr "Луг"
+
+#. item
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
-msgstr ""
+msgstr "Редактировать Луг"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Править виноградник"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Огороды"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Править огороды"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Сад"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Править сад"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Трава"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Править траву"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
-msgstr ""
+msgstr "Село"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
-msgstr ""
+msgstr "Редактировать Село"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Общее"
@@ -16600,20 +16728,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Править общее"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Парк"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Править парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Спортплощадка"
@@ -16621,5 +16749,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Править спортплощадку"
@@ -16627,15 +16755,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Править жилую зону"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Церковное кладбище"
@@ -16643,9 +16771,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Править церковное кладбище"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -16653,39 +16781,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Править кладбище"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Править розничную торговлю"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Коммерция"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Править коммерцию"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Промышленность"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Править промышленность"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Железная дорога"
@@ -16693,114 +16821,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Править ж/д пути"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Военное"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Править военное"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Стройплощадка"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Править стройплощадку"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Пустырь с развалинами"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Править пустырь с развалинами"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Пустырь"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "Править пустырь"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Стройплощадка"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Править стройплощадку"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Править свалку"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Править карьер"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Военное"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Править военное"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Пустошь"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr ""
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Мультиполигональное"
@@ -16810,5 +16895,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Править мультиполигональное отношение"
@@ -16817,16 +16902,16 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
-msgstr ""
+msgstr "внешний сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
-msgstr ""
+msgstr "внутренний сегмент"
 
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -16835,5 +16920,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Править ограничение на поворот"
@@ -16841,34 +16926,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "движение только направо"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "движение только налево"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "движение только прямо"
@@ -16877,15 +16962,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "с улицы"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "на улицу"
@@ -16893,5 +16978,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Маршрут"
@@ -16900,5 +16985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "Править маршрут"
@@ -16906,5 +16991,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Тип маршрута"
@@ -16976,24 +17061,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "велосипедный"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "лыжный"
@@ -17038,4 +17123,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17045,19 +17133,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "пеший"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "туристический"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "объездной"
@@ -17071,10 +17160,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "Описание символа"
@@ -17082,26 +17171,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Сеть"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -17110,30 +17199,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "конечная назад"
@@ -17189,5 +17278,5 @@
 #: build/trans_style.java:49
 msgid "standard"
-msgstr ""
+msgstr "стандартный"
 
 #. mappaint style named "standard"
@@ -17279,5 +17368,5 @@
 #: build/trans_style.java:140
 msgid "bridge"
-msgstr ""
+msgstr "мост"
 
 #. color bridge
@@ -17317,4 +17406,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17326,4 +17522,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17425,13 +17630,15 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
-msgstr ""
+msgstr "уменьшать"
 
 #. color foot
@@ -17471,7 +17678,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
-msgstr ""
+msgstr "лошадь"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Преграды"
 
 #. color tertiary
@@ -17507,8 +17929,8 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
-msgstr ""
+msgstr "улица"
 
 #. color street
@@ -17562,9 +17984,9 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
-msgstr ""
+msgstr "шоссе"
 
 #. color foot
@@ -17609,108 +18031,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
-msgstr ""
-
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr ""
-
-#. color viaduct
+msgstr "железная дорога"
+
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17727,4 +18062,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "Служебная"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17734,4 +18075,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Брод"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17748,7 +18095,21 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
-msgstr ""
+msgstr "кольцо"
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "Пункт вызова экстренной помощи"
 
 #. color water
@@ -17761,5 +18122,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "берег реки"
@@ -17773,7 +18134,7 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
-msgstr ""
+msgstr "поток"
 
 #. color water
@@ -17785,7 +18146,7 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
-msgstr ""
+msgstr "док"
 
 #. color dock
@@ -17811,7 +18172,7 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
-msgstr ""
+msgstr "акведук"
 
 #. color aqueduct
@@ -17824,4 +18185,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17861,5 +18223,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17976,14 +18338,15 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
-msgstr ""
+msgstr "искусственный"
 
 #. color manmade
@@ -18027,5 +18390,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18043,9 +18406,9 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
-msgstr ""
+msgstr "железнодорожная станция"
 
 #. color rail
@@ -18066,12 +18429,12 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
-msgstr ""
+msgstr "другая жд дорога"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
-msgstr ""
+msgstr "жд дорога сверху"
 
 #. color subway
@@ -18099,8 +18462,8 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
-msgstr ""
+msgstr "Старая жд дорога"
 
 #. color rail
@@ -18143,8 +18506,8 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
-msgstr ""
+msgstr "воздушная трасса"
 
 #. color aeroway
@@ -18156,7 +18519,7 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
-msgstr ""
+msgstr "пассажирский терминал"
 
 #. color terminal
@@ -18176,7 +18539,7 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
-msgstr ""
+msgstr "воздушная трасса темная"
 
 #. color aeroway
@@ -18188,7 +18551,7 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
-msgstr ""
+msgstr "воздушная трасса светлая"
 
 #. color aeroway_light
@@ -18209,4 +18572,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18226,4 +18597,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "воздушная трасса"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18232,25 +18609,12 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr ""
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
-msgstr ""
+msgstr "легкая трасси"
 
 #. color piste_easy
@@ -18262,7 +18626,8 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
-msgstr ""
+msgstr "промежуточная трасса"
 
 #. color piste_intermediate
@@ -18274,7 +18639,8 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
-msgstr ""
+msgstr "продвинутая трасса"
 
 #. color piste_advanced
@@ -18285,8 +18651,23 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "бесплатная трасса"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
-msgstr ""
+msgstr "бесплатная трасса"
 
 #. color piste_freeride
@@ -18298,7 +18679,8 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
-msgstr ""
+msgstr "трасса для новичков"
 
 #. color piste_novice
@@ -18327,4 +18709,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18359,4 +18749,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18369,10 +18783,12 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
-msgstr ""
+msgstr "энергия"
 
 #. color manmade
@@ -18383,7 +18799,10 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
-msgstr ""
+msgstr "плотина"
 
 #. color pier
@@ -18395,7 +18814,7 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
-msgstr ""
+msgstr "трубопровод"
 
 #. color manmade
@@ -18521,14 +18940,14 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
-msgstr ""
+msgstr "свободное время"
 
 #. color leisure
@@ -18540,7 +18959,7 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
-msgstr ""
+msgstr "гавань"
 
 #. color leisure
@@ -18610,10 +19029,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
-msgstr ""
+msgstr "использование"
 
 #. color amenity
@@ -18647,4 +19066,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18704,13 +19131,13 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
-msgstr ""
+msgstr "режим использования"
 
 #. color amenity_traffic
@@ -18847,6 +19274,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19073,24 +19521,24 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
-msgstr ""
+msgstr "легкое использование"
 
 #. color amenity_light
@@ -19120,8 +19568,8 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
-msgstr ""
+msgstr "легкая вода"
 
 #. color amenity_light
@@ -19155,4 +19603,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19172,9 +19628,10 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
-msgstr ""
+msgstr "здоровье"
 
 #. color deprecated
@@ -19266,4 +19723,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19466,4 +19931,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19497,30 +19978,32 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
-msgstr ""
+msgstr "Магазин"
 
 #. color shop
@@ -19572,4 +20055,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19582,10 +20073,10 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
-msgstr ""
+msgstr "отель"
 
 #. color hotel
@@ -19638,4 +20129,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19732,9 +20224,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "туризм"
@@ -19806,8 +20298,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "исторический"
@@ -19877,11 +20369,11 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
-msgstr ""
+msgstr "зеленый"
 
 #. color green
@@ -19893,7 +20385,7 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
-msgstr ""
+msgstr "карьер"
 
 #. color quarry
@@ -19905,7 +20397,7 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
-msgstr ""
+msgstr "мусорная свалка"
 
 #. color landfill
@@ -19925,5 +20417,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "водоём"
@@ -19937,5 +20429,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "лес"
@@ -19949,7 +20441,7 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
-msgstr ""
+msgstr "двор фермы"
 
 #. color farmyard
@@ -19970,7 +20462,7 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
-msgstr ""
+msgstr "розничная продажа"
 
 #. color retail
@@ -19982,7 +20474,7 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
-msgstr ""
+msgstr "промышленный"
 
 #. color industrial
@@ -19994,7 +20486,7 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
-msgstr ""
+msgstr "заброшенная застройка"
 
 #. color brownfield
@@ -20006,7 +20498,7 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
-msgstr ""
+msgstr "участок для застройки"
 
 #. color greenfield
@@ -20018,7 +20510,7 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
-msgstr ""
+msgstr "жд разъезд"
 
 #. color construction
@@ -20073,9 +20565,9 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
-msgstr ""
+msgstr "военный"
 
 #. color military
@@ -20087,5 +20579,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "кладбище"
@@ -20098,5 +20590,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "пик"
@@ -20111,7 +20603,7 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
-msgstr ""
+msgstr "ледник"
 
 #. color glacier
@@ -20123,5 +20615,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "вулкан"
@@ -20136,4 +20628,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20175,9 +20668,10 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
-msgstr ""
+msgstr "природный"
 
 #. color natural
@@ -20189,7 +20683,7 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
-msgstr ""
+msgstr "кустарник"
 
 #. color natural
@@ -20201,7 +20695,7 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
-msgstr ""
+msgstr "здоровье"
 
 #. color heath
@@ -20213,7 +20707,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
-msgstr ""
+msgstr "лес"
 
 #. color water
@@ -20225,7 +20719,7 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
-msgstr ""
+msgstr "грязь"
 
 #. color mud
@@ -20237,7 +20731,7 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
-msgstr ""
+msgstr "пляж"
 
 #. color natural
@@ -20313,8 +20807,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "маршрут"
@@ -20362,7 +20856,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "граница"
@@ -20504,12 +20998,12 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
-msgstr ""
+msgstr "место"
 
 #. color area
@@ -20548,8 +21042,15 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
-msgstr ""
+msgstr "адрес"
 
 #. <?xml version="1.0"?>
@@ -20829,167 +21330,51 @@
 msgstr "Улицы NRW Geofabrik.de"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "Если ваш GPS модуль сохраняет точки слишком редко, включите эту опцию, "
-#~ "чтобы соединить точки линиями."
-
-#~ msgid "Navigate"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Открыть..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Описание"
+
+#~ msgid "Commit comment"
+#~ msgstr "Комментарий правки"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Сервер не поддерживает управление версиями"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Передача прервана из-за ошибки (повторная попытка через 5 с):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Вы действительно желаете отметить проблему, как решённую?"
+
+#~ msgid "Navigation"
 #~ msgstr "Навигация"
 
-#~ msgid "Navigator"
-#~ msgstr "Навигатор"
-
-#~ msgid "Reset Graph"
-#~ msgstr "Обнулить граф"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Пожалуйста, выберите что-либо из списка конфликтов."
-
-#~ msgid "Please select a color."
-#~ msgstr "Пожалуйста, выберите цвет"
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Не запускать в полноэкранном режиме"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Новости о JOSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Щёлкните, чтобы создать новую линию к существующей точке."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Щёлкните, чтобы соединить с существующей точкой."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Щёлкните, чтобы добавить новую точку и создать новую линию."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Щёлкните, чтобы вставить точку и соединить линию"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Загрузить этот маршрут"
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Данная функциональность добавлена совсем недавно. Пожалуйста,"
-#~ "<br>пользуйтесь с осторожностью, и проверяйте, чтоб всё работало, как "
-#~ "надо.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Загрузить маршрут, отфильтрованный в JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Загрузить необработанный файл: "
-
-#~ msgid "Description:"
-#~ msgstr "Описание:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Тэги (ключевые слова в GPX)"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "Загрузка GPX"
-
-#~ msgid "time"
-#~ msgstr "время"
-
-#~ msgid "desc"
-#~ msgstr "описание"
-
-#~ msgid "symbol"
-#~ msgstr "символ"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Загрузить необработанный файл: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Тэги:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "Выбрать цвет линии в зависимости от скорости в точке."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Править съезд"
-
-#~ msgid "Exit Number"
-#~ msgstr "Номер съезда"
-
-#~ msgid "Exit Name"
-#~ msgstr "Название съезда"
-
-#~ msgid "Waterway"
-#~ msgstr "Водоёмы"
-
-#~ msgid "Information point"
-#~ msgstr "Информационный пункт"
-
-#~ msgid "political"
-#~ msgstr "Политическая"
-
-#~ msgid "National_park"
-#~ msgstr "Национальный парк"
-
-#~ msgid "Natural"
-#~ msgstr "Естественное"
-
-#~ msgid "Add Site"
-#~ msgstr "Добавить сайт"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Удалить сайт(ы)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Пожалуйста удалите сайт для удаления."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Проверить сайт(ы)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Пожалуйста, отметьте сайт(ы) для обновления"
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Добавть новый сайт модулей."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Удалить выбранный сайт(ы) из списка"
-
-#~ msgid "Update Sites"
-#~ msgstr "Обновить сайты"
-
-#~ msgid "Version"
-#~ msgstr "Версия"
-
-#~ msgid "Install"
-#~ msgstr "Установить"
-
-#~ msgid "Signpost"
-#~ msgstr "Столб с указателями"
-
-#~ msgid "office"
-#~ msgstr "офис"
-
-#~ msgid "guidepost"
-#~ msgstr "указатель"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Обновить сайты"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Недопустимая дата"
-
-#~ msgid "Update available"
-#~ msgstr "Доступно обновление"
-
-#~ msgid "Version Details:"
-#~ msgstr "Данные о версии:"
-
-#~ msgid ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
-#~ msgstr ""
-#~ "Установленная: {2}; Текущая: {0}; <font style=\"font-size:x-small\">"
-#~ "(последняя нестабильная: {1} &#150; не рекомендуется)</font>"
+#~ msgid "Remove route nodes"
+#~ msgstr "Удалить узлы маршрутизации"
+
+#~ msgid "Start routing"
+#~ msgstr "Начать маршрутизацию"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Подъёмный мост"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Править подъёмный мост"
+
+#~ msgid "Portcullis"
+#~ msgstr "Опускающаяся решётка"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Править опускающуюся решётку"
+
+#~ msgid "Charge"
+#~ msgstr "Переодевание"
+
+#~ msgid "sports"
+#~ msgstr "Спортивный"
+
+#~ msgid "viaduct"
+#~ msgstr "виадук"
Index: /applications/editors/josm/i18n/po/sk.po
===================================================================
--- /applications/editors/josm/i18n/po/sk.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/sk.po	(revision 14844)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-26 15:28+0000\n"
-"Last-Translator: Vlado <babicvm@szm.sk>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-29 09:06+0000\n"
+"Last-Translator: kayle.sk <webmaster@kayle.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "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-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Vytváram hlavné grafické rozhranie ( GUI )"
@@ -36,38 +36,38 @@
 msgstr "Projekcia nemôže byť načítaná z nastavení. Použijem EPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Tip: Pri nahrávaní nových dát zo servera nastali nejaké zmeny."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Neuložené zmeny"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Zmeny nie sú uložené. Zahodiť zmeny a pokračovať?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Uložiť a Ukončiť"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Zrušiť a Ukončiť"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -78,10 +78,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -92,4 +92,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -99,10 +100,10 @@
 msgstr "Zrušiť"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorujem skomolenú URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -128,8 +129,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -270,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -405,6 +406,6 @@
 msgstr "Otočiť a Spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -412,20 +413,20 @@
 msgstr "Zadajte hodnoty pre všetky konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Riešenie konfliktov"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Spojiť {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Všetky cesty byli prázdne"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -526,5 +527,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -645,6 +646,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -653,6 +654,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -781,10 +782,10 @@
 msgstr "Spojiť akokoľvek"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "Nemôžem spojiť body: Zmazala by sa tak cesta, ktorá je stále používaná."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1060,5 +1061,5 @@
 msgstr "Uložiť aktuálne dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1067,26 +1068,26 @@
 "Interná chyba: nemôžem overiť podmienky pre žiadne vrstvy. Hlásim chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Prázdny dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Dokument neobsahuje dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Uložiť akokoľvek"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1096,32 +1097,32 @@
 "vyriešené, ako by boli všetky odmietnuté. Pokračovať?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Zamietnuť konflikty a Uložiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Uložiť GPX súbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Uložiť OSM súbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Nemôžem zálohovať súbor."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Neznáma prípona súboru"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Behom ukladania došlo k chybe."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Behom obnovenia zálohy došlo k chybe."
@@ -1179,18 +1180,18 @@
 msgstr "Zavrieť"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Rozdeliť cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Rozdeliť cestu vo zvolenom bode"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Tento výber nemôže byť použitý k rozdeleniu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1199,5 +1200,5 @@
 msgstr[2] "Vybraté body nie sú v strede cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1216,9 +1217,9 @@
 "vyberte tiež cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "Zvolené body nezdieľajú zhodnú cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1227,10 +1228,10 @@
 msgstr[2] "Označená cesta neobsahuje všetky vybraté body."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musíte zvoliť dva alebo viacej bodov pre rozdelenie kruhovej cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1240,5 +1241,5 @@
 "cesty.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1249,5 +1250,5 @@
 "Môžete preveriť správnosť, ak je to nevyhnutné."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1405,46 +1406,50 @@
 "pokračovať?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Nahrať do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Nahrať všetky zmeny na OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Pridané objekty:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Upravené objekty:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Odstránené objekty:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Doplniť krátky komentár k nahrávaným zmenám"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Uložiť tieto úpravy?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Nahrať zmeny"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Sú tu nevyriešené konflikty. Musíte jich najskôr vyriešiť."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Žiadne zmeny pre uloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Nahrávam dáta"
@@ -1629,31 +1634,33 @@
 msgstr "Nemôžem pridať body ležiace mimo svet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Pridať bod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Pridať bod do cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Pripojiť existujúcu cestu do bodu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Pridať nový bod do existujúcej cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Pridať bod do cesty a spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Vytvoriť nový bod."
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Vybrať bod pod kurzorom."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1663,9 +1670,4 @@
 msgstr[1] "Vložiť nový bod do cesty."
 msgstr[2] "Vložiť nový bod do {0} ciest."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Vybrať bod pod kurzorom."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2091,11 +2093,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
 msgid_plural "nodes"
-msgstr[0] "bodov"
-msgstr[1] "bod"
-msgstr[2] "body"
+msgstr[0] "bod"
+msgstr[1] "body"
+msgstr[2] "bodov"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
@@ -2287,5 +2289,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "železnica"
@@ -2304,131 +2306,131 @@
 msgid "{0} node"
 msgid_plural "{0} nodes"
-msgstr[0] "{0} bodov"
-msgstr[1] "{0} bod"
-msgstr[2] "{0} body"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+msgstr[0] "{0} bod"
+msgstr[1] "{0} body"
+msgstr[2] "{0} bodov"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Cesta označená ako plocha nie je uzavretá."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Prázdny člen vo vzťahu (relation)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s menej, než dvoma bodmi."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Najdená viac než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Najdené viac cieľových \"to\" ciest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "Viac ako jedna \"via\" najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznáma funkcia ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámy typ člena pre ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Nenajdená cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Nenajdená cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "Nie je \"via\" bod alebo cesta najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" bode."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Štýl pre obmedzenie {0} nenajdený."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Vnútorná(inner) cesta ''{0}'' je vonku."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "neoznačený"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "text"
@@ -2436,5 +2438,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2463,5 +2465,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "pozadie"
@@ -2528,5 +2530,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2540,5 +2542,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2569,14 +2571,14 @@
 msgstr "finálna verzia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Správu dňa nie je možné zobraziť"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "- teraz používaná verzia je {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Sťahujem \"Správu dňa\""
@@ -2649,71 +2651,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Meno používateľa"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr "Nemôžem nájsť preklad pre jazyk {0}. Vyberám {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "použitie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Zobrazí túto nápovedu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Štandardný unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Stiahnuť ohraničujúcí box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Otvoriť súbor (as raw gps, if .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Výber s určeným hľadaním"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr "Spustiť v maximalizovanom režime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Nastaviť východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Nastaviť jazyk."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "príklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2724,23 +2726,28 @@
 "nejaké dáta predtým--výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Namiesto --download=<bbox> môžete zadať osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Aktivujem aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Načítavam skoršie pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Nastavujem východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Načítavam pluginy"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2918,5 +2925,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3133,5 +3140,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Úloha"
@@ -3179,73 +3186,71 @@
 msgstr "Vlastnosti / Memberships"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Použiť zmeny"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Vytvoriť novú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Upraviť novú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Upraviť reláciu #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Základný"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Zaneprázdnený"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Značky (prázdne hodnoty zmazaných značiek)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Členovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Posunút Hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Pridať všetky zvolené objekty medzi členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Pridať vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Pridať všetky zvolené objekty medzi členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Odstrániť označené"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Posunúť dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Presunúť zvolenú vrstvu o riadok dolu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3254,36 +3259,36 @@
 msgstr "Odstrániť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Odstrániť člena(member) v aktuálnom riadku tabuľky z tejto relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Stiahnuť členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Členov: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Editor relácie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Vznikli konflikty počas importu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Chyba parsovania odozvy servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Nemôžem sa pripojiť na server."
@@ -3297,10 +3302,11 @@
 msgstr "Zmazať vybraté relácie"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relácie"
@@ -3496,5 +3502,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Miesta"
@@ -3541,21 +3547,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "typ"
@@ -3609,10 +3615,7 @@
 "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo  posun"
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Mapa"
@@ -3767,4 +3770,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3831,7 +3835,7 @@
 msgid "{0} waypoint"
 msgid_plural "{0} waypoints"
-msgstr[0] "{0} waypointov (bodov cesty)"
-msgstr[1] "{0} waypoint (bod cesty)"
-msgstr[2] "{0} waypointy (body cesty)"
+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:308
@@ -3873,5 +3877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3934,19 +3938,34 @@
 "ich času boli vynechané."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "mimo ukladanej oblasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Verzia {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skladá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} zmazané.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "použitie"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Verzia {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3954,21 +3973,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -3980,7 +3999,7 @@
 msgid "point"
 msgid_plural "points"
-msgstr[0] "bodov"
-msgstr[1] "bod"
-msgstr[2] "body"
+msgstr[0] "bod"
+msgstr[1] "body"
+msgstr[2] "bodov"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177
@@ -4004,7 +4023,7 @@
 msgid "{0} point"
 msgid_plural "{0} points"
-msgstr[0] "{0} bodov"
-msgstr[1] "{0} bod"
-msgstr[2] "{0} body"
+msgstr[0] "{0} bod"
+msgstr[1] "{0} body"
+msgstr[2] "{0} bodov"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
@@ -4415,5 +4434,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4498,4 +4517,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4579,7 +4600,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4592,7 +4610,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4608,10 +4633,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4780,5 +4805,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4812,7 +4839,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4896,4 +4923,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4946,4 +4981,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4952,7 +4993,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4961,15 +4999,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4994,129 +5021,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Názov"
@@ -5165,12 +5194,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Nahrať Všetky Dlaždice"
+msgstr "Miestne súbory"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zóna (oblasť)"
+msgstr "Žiadny"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5197,45 +5224,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Vozidlo"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Bicykel"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5243,25 +5260,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Pešo"
@@ -5309,7 +5331,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Kresliť spojnice medzi GPS bodmi"
+msgstr "Kresliť čiary medzi raw GPS bodmi"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5750,5 +5771,5 @@
 "<p>Ako ste si mohli všimnúť, že výber kláves ktorý ponúka ďalšia strana sa "
 "nachádza na každom druhu klávesníc ktorá Java pozná, ale nemusí poznať "
-"všetky klávesy no vašej klávesnici. Prosím použite iba hodnoty, ktoré "
+"všetky klávesy na vašej klávesnici. Prosím použite iba hodnoty, ktoré "
 "zodpovedajú skutočnej klávese na vašej klávesnici. Takže ak vaša klávesnica "
 "nemá \"Copy\" klávesu (PC klávesnica ju nemá, SUN klávesnica ju má), tak ju "
@@ -5949,10 +5970,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, pravdepodobne chýbajú niektoré značky (tagy)."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Pripravujem dáta..."
@@ -5962,25 +5983,75 @@
 msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Otváranie kontroly..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Zatváranie kontroly..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Žiadne zmeny pre uloženie."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Pripravujem..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Nahrávam..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Chyba parsovania odozvy servera"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Neznámy hostiteľ"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Nesprávne heslo alebo meno."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Upozornenie: Heslo sa posiela nešifrované."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Uložiť meno a heslo (nešifrovane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Prihlásenie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5991,44 +6062,52 @@
 msgstr "Chyba v priebehu parsovania"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Neznáma verzia"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Neznáma verzia"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Nájdený element <nd> mimo cesty."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> má nulový ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Nájdený <member> element mimo relácie."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletné <member> špecifikácie s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Chýba povinný atribút \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Vynecháva sa cesta pretože obsahuje body ktoré neexistujú: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Pripravujem OSM dáta..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Zle formulované id bodu"
@@ -6038,5 +6117,5 @@
 msgstr "Kontaktujem server..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -6045,5 +6124,5 @@
 "internetu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6053,55 +6132,8 @@
 "oblasť."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Doplniť krátky komentár k nahrávaným zmenám"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Poslať komentár"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} ostáva. Odosielam {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Nastala chyba : {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Otváranie kontroly..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Server neobsahuje kontroly"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Neznámy hostiteľ"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Pripravujem..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Nahrávam..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Zatváranie kontroly..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6125,6 +6157,6 @@
 msgid "{0} Plugin successfully updated. Please restart JOSM."
 msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-msgstr[0] "{0} plugin úspešne aktualizovaný. Prosím, reštartujte JOSM."
-msgstr[1] "{0} pluginov úspešne aktualizovaných. Prosím, reštartujte JOSM."
+msgstr[0] "{0} pluginov úspešne aktualizovaných. Prosím, reštartujte JOSM."
+msgstr[1] "{0} plugin úspešne aktualizovaný. Prosím, reštartujte JOSM."
 msgstr[2] "{0} pluginy úspešne aktualizované. Prosím, reštartujte JOSM."
 
@@ -6272,6 +6304,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "neznámy"
@@ -6458,7 +6490,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Vytvoriť plochy"
+msgstr "Vytvoriť  cestnú sieť"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6467,17 +6498,18 @@
 "in common"
 msgstr ""
+"Tvar cestnej siete na základe dvoch existujúcich, ktoré majú rôzne body a "
+"jeden spoločný"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Vybrať dve cesty s so spoločným bodom"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
 msgid "Select two ways with alone a node in common"
-msgstr ""
+msgstr "Vybrať dve cesty bez spoločného bodu"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Vytvoriť plochy"
+msgstr "Vytvoriť cestnú sieť"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6501,5 +6533,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Popis"
@@ -7776,7 +7808,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "voda"
@@ -8081,5 +8113,5 @@
 msgstr "OpenStreetBugs sťahovaná slučka"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Zobrazuje chyby z OpenStreetBugs"
@@ -8098,4 +8130,11 @@
 msgstr "Varovanie"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Nastala chyba : {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8124,35 +8163,38 @@
 "OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Pridať komentár"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Zadajte váš komentár"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Označiť ako hotové"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Naozaj označiť tento problém ako \"hotový\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Naozaj uzavrieť?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Nový problém"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Vytvoriť problém"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Podrobne popíšte problém"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Vytvoriť problém"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8181,5 +8223,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8188,9 +8230,9 @@
 "Firefox sa nenašiel. Prosím nastavte spúšťací .exe súbor v nastaveniach."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "možnosti pre osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Spúšťací súbor Firefoxu"
@@ -8261,129 +8303,113 @@
 msgstr "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Navigácia"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr "Trasovanie (Routing)"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Nič"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "Kľuknúť pre pridanie traťových bodov"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Kľuknite pre vloženie nového bodu."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "Kľuknúť a ťahom posunúť trasové body."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Kľuknite pre vloženie nového bodu."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "Kľuknúť pre pridanie traťových bodov"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "Otvoriť zoznam trasových bodov"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "Odstraňujem duplicitné body..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Otvoríť zoznam všetkých relácií"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Stanica"
+msgid "Add routing layer"
+msgstr "Pridať novú vrstvu"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "svah pre mierne pokročilých"
+msgstr "Kritérium"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Obuva"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "Najkratšia"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Rýchlejšie"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "Najrýchlejšia"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Otočiť smer radu budov"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr "Opačná trasa"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Prievoz, trajekt"
+msgstr "Vymazať trasu"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Nastavenie WMS Pluginu"
+msgstr "Nastavenia trasového (Routing) Pluginu"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Konfigurovať umiestnenie pluginov"
+msgstr "Konfigurácia trasových priorít."
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Výjazd z diaľnice"
+msgstr "Typ komunikácie"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Max. rýchlosť (km/h)"
+msgstr "Rýchlosť (Km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Výška"
+msgstr "Hmotnosť"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
 msgid "Enter weight values"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+msgstr "Vstup hmotnostnej hodnoty"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Nahrať Dlaždice (Tiles)"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Zobraziť Stav Dlaždíc"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Žiadosť na aktualizáciu"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Nahrať Všetky Dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Priblíženie"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Oddialiť"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "Obrázok nie je nahratý"
@@ -8406,34 +8432,34 @@
 msgstr "Nastavenia pre SlippyMap plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Zdroje Dlaždíc"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Automatické zväčšenie: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Automatické nahratie Dlaždíc: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Max zväčšenie lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Vyblednúť pozadie: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "chyba pri zavádzaní metadát"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "požadovaný: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "chyba požadovanej aktualizácie"
@@ -8448,5 +8474,5 @@
 msgstr "Uložiť zachytené dáta do súboru každý minútu."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8503,7 +8529,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Upraviť štát"
+msgstr "Upraviť značky"
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8511,68 +8536,60 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:66
 msgid "Launches the tag editor dialog"
-msgstr ""
+msgstr "Otvoriť dialóg úpravy značiek"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
 msgid "JOSM Tag Editor Plugin"
-msgstr ""
+msgstr "JOSM Tag Editor Plugin (plugin pre úpravu značiek)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "žiadny"
+msgstr "(žiadny)"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "označiť (highlight)"
+msgstr "Zvýrazniť"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "multi"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr "<mnohonásobný>"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Zmeniť vlastnosti až {0} objektu."
-msgstr[1] "Zmeniť vlastnosti až {0} objektov."
-msgstr[2] "Zmeniť vlastnosti až {0} objektov."
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] "Odstrániť staré kľúče z {0} objektov"
+msgstr[1] "Odstrániť staré kľúče z {0} objektu"
+msgstr[2] "Odstrániť staré kľúče z {0} objektov"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Zmeniť vlastnosti až {0} objektu."
-msgstr[1] "Zmeniť vlastnosti až {0} objektov."
-msgstr[2] "Zmeniť vlastnosti až {0} objektov."
+msgstr[0] "Aktualizácia vlastností {0} objektov"
+msgstr[1] "Aktualizácia vlastností {0} objektu"
+msgstr[2] "Aktualizácia vlastností {0} objektov"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "trasa (route)"
+msgstr "Skupina"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Potok"
+msgstr "Položka"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Hľadať"
+msgstr "Hľadať: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Súbor"
+msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Vozidlo"
+msgstr "Vyčistiť"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8658,5 +8675,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Názov ulice"
@@ -8754,24 +8771,21 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Pridať body na všetky priesečníky"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
+msgstr "Vymazať cesty, ktoré nie sú  vnútornou časťou multipolygónu"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "vzťah (relation)"
+msgstr "Oprava relácie"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Spojiť prekrývajúce sa Plochy"
+msgstr "Spojená prekrývajúca sa plocha"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Spojiť prekrývajúce sa Plochy"
+msgstr "Spojené prekrývajúce sa plochy"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8784,31 +8798,26 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Spojenie konfliktov"
+msgstr "Oprava konfliktu (rozporu) značiek"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Zmazať z relácie (zo vzťahu"
+msgstr "Odstránený Prvok z Relácií"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Spojiť plochy: Vymazať krátke cesty"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Neuzavreté cesty."
+msgstr "Uzavretá cesta"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Odstraniť fotku z vrstvy"
+msgstr "Vymazať značky z vnútorných ciest"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Ďialničná križovatka"
+msgstr "Funkcie Spojenia Plôch (Join Areas Function)"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9410,4 +9419,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9489,7 +9504,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "budovy"
@@ -9503,5 +9518,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "oblasť(plocha)"
@@ -9805,4 +9820,9 @@
 msgstr "namôžem získať zvuk zo vstupu URL"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9836,7 +9856,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Vytvoriť plochy"
+msgstr "Vytvoriť cestnú sieť"
 
 #. Plugin DirectUpload
@@ -9947,21 +9966,28 @@
 "Spustiť FireFox na aktuálne viditeľné zobrazenie, ako pekný SVG obrázok."
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr "Nechať ostatné aplikácie poslať príkaz do JOSMu."
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
-msgstr ""
+msgstr "Určiť trasové schopnosti"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9972,15 +9998,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Doviliť pridať značky/bodoy na aktuálnej gps pozícii."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr ""
+msgstr "Určiť dialóg pre editáciu značiek v tabuľkovej mriežke."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9993,15 +10019,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr "Priamo nahrať TCX súbory z JOSMu."
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytvárať radové domy mimo jednotlivých blokov."
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -10013,5 +10039,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -10022,5 +10048,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -10032,5 +10058,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10122,5 +10148,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Odkaz"
@@ -10175,7 +10201,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Vrstva"
@@ -10218,5 +10244,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Max. rýchlosť (km/h)"
@@ -10264,5 +10290,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Jednosmerka"
@@ -10318,5 +10344,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -10366,5 +10392,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunel"
@@ -10411,5 +10437,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Výkop"
@@ -10456,5 +10482,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Násyp"
@@ -10612,6 +10638,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Šírka (v metroch)"
@@ -10660,5 +10686,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Povrch"
@@ -10690,5 +10716,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "spevnený"
@@ -10699,5 +10725,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "nespevnený"
@@ -10711,5 +10737,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "dlažbová kocka (cobblestone)"
@@ -10861,5 +10887,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10880,6 +10906,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "áno"
@@ -11023,7 +11049,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "nie"
@@ -11037,73 +11063,63 @@
 msgstr "Nákladné vozidlá"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Kôň"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motocykel"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
@@ -11178,130 +11194,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Typ"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11309,5 +11213,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11315,11 +11219,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11327,5 +11225,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11333,5 +11231,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11339,5 +11237,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11345,6 +11243,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11363,6 +11267,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "dialnica (motorway)"
@@ -11388,6 +11292,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "cesta pre motorové vozidlá (trunk)"
@@ -11413,6 +11317,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "cesta prvej triedy"
@@ -11438,6 +11342,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "cesta druhej triedy"
@@ -11451,5 +11355,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "cesta tretej triedy"
@@ -11467,5 +11371,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "obytná (osídlená)"
@@ -11483,5 +11387,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "obslužná (service)"
@@ -11508,6 +11412,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "konštrukcia"
@@ -11548,6 +11452,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11558,5 +11461,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "kruhový objazd (roundabout)"
@@ -11900,14 +11803,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Operátor"
@@ -11932,20 +11835,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "neriadený"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "semafor"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "ostrovček"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "neoznačený"
@@ -11953,5 +11856,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "Prechod pre jazdcov na koňoch"
@@ -11960,5 +11863,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "Prechod pre cyklistov"
@@ -11968,5 +11871,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr "Prechod cez cestu s obsluhou"
@@ -12116,10 +12019,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -12132,29 +12036,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Turniket (Stile)"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Upraviť turniket"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Stĺpik"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Upraviť stĺpik"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12163,7 +12056,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12172,75 +12068,43 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Povolená prevádzka:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr "Automatická brána pre hospodárske zvieratá (Kissing)"
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr "Upraviť automatickú bránu pre hosp. zvieratá (kissing)"
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Brána pre zvieratá (Hampshire)"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Upraviť bránu pre zvieratá (hampshire)"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Stĺpik"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Upraviť stĺpik"
-
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Padací most"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Upraviť padací most"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr "Cyklo prekážka (Cycle Barrier)"
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Balvan (Block)"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
 msgid "Cattle Grid"
 msgstr ""
@@ -12250,5 +12114,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
+#: build/trans_presets.java:851
 msgid "Edit Cattle Grid"
 msgstr ""
@@ -12257,25 +12121,93 @@
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
 msgid "Spikes"
 msgstr "Špičky (hroty)"
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:865
 msgid "Edit Spikes"
 msgstr "Upraviť Hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Mreže"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Upraviť mreže"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Mýtna búdka"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Upraviť mýtnu búdku"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Hraničná kontrola"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Upraviť hraničnú kontrolu"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Živý plot (Hedge)"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Plot"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Hradby"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Mestské hradby"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Oporný múr"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Vstup"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Upraviť vstup"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "Brána"
@@ -12283,25 +12215,66 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr "Upraviť bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr "Závora (Lift Gate)"
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr "Upraviť závoru (Lift Gate)"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Brána pre zvieratá (Hampshire)"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Upraviť bránu pre zvieratá (hampshire)"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Brána pre otváranie predkom auta (bump)"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Upraviť bránu pre otváranie predkom auta (bump)"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr "Automatická brána pre hospodárske zvieratá (Kissing)"
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr "Upraviť automatickú bránu pre hosp. zvieratá (kissing)"
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Turniket (Stile)"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Upraviť turniket"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr ""
@@ -12310,103 +12283,14 @@
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Brána pre otváranie predkom auta (bump)"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Upraviť bránu pre otváranie predkom auta (bump)"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr "Cyklo prekážka (Cycle Barrier)"
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Živý plot (Hedge)"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Plot"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Balvan (Block)"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Hradby"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Mestské hradby"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Oporný múr"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Mýtna búdka"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Upraviť mýtnu búdku"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Hraničná kontrola"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Upraviť hraničnú kontrolu"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Vstup"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Upraviť vstup"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Prameň"
@@ -12414,5 +12298,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Upraviť prameň"
@@ -12420,5 +12304,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Odvodňovací kanál, odtok"
@@ -12426,10 +12310,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Upraviť odvodňovací kanál, odtok"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Potok"
@@ -12437,10 +12321,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Upraviť potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Prieplav"
@@ -12448,10 +12332,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Upraviť prieplav"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Rieka"
@@ -12461,5 +12345,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Upraviť rieku"
@@ -12467,15 +12351,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Upraviť vodu"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Zem (Pevnina)"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Upraviť Zem (Pevnina)"
@@ -12483,15 +12367,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Basin (Kotvisko pre lode)"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Upraviť Basin (Kotvisko pre lode)"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Nádrž"
@@ -12499,15 +12383,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Upraviť nádrž"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Krytá nádrž"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Upraviť krytú nádrž"
@@ -12515,5 +12399,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Riečny breh"
@@ -12522,10 +12406,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Upraviť riečny breh"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Mokraď"
@@ -12536,56 +12420,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Upraviť mokraď"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "Močiar"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "slatina"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "močiar (marsh)"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "mokraď´s rákosím"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "soľná bažina"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "prílivová oblasť"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "mangrovová oblasť"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Blato"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Upraviť blato"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Pláž"
@@ -12593,20 +12477,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Upraviť pláž"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Záliv"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Upraviť záliv"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Útes"
@@ -12614,10 +12498,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Upraviť útes"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Pobrežie"
@@ -12625,5 +12509,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Upraviť pobrežie"
@@ -12631,5 +12515,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Prievoz, trajekt"
@@ -12637,5 +12521,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Upraviť prievoz, trajekt"
@@ -12644,5 +12528,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Lodenica"
@@ -12650,10 +12534,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Upraviť lodenicu"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Dok, prístavná hrádza"
@@ -12661,5 +12545,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Upraviť dok, prístavnú hrádzu"
@@ -12667,5 +12551,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Priehrada, nádrž"
@@ -12673,15 +12557,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Upraviť priehradu, nádrž"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Vodné objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Plavebná komora"
@@ -12690,5 +12574,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Priehradzka"
@@ -12696,20 +12580,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Upraviť priehradzku"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Upraviť vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Turning Point (koniec cesty)"
@@ -12718,15 +12602,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Prístav (Marina)"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Upraviť Prístav (Marina)"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Mólo"
@@ -12734,10 +12618,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Upraviť mólo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Prístavisko prievozu, trajektu"
@@ -12745,10 +12629,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Upraviť prístavisko prievozu, trajektu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Slipway (rampa na vyzdvihnutie lode z vody na breh)"
@@ -12758,5 +12642,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Upraviť slipway (rampa na vyzdvihnutie lode z vody na breh)"
@@ -12764,10 +12648,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Železnica (štandardná)"
@@ -12775,5 +12659,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Upraviť železničnú koľaj"
@@ -12803,8 +12687,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Voliteľné typy"
@@ -12818,35 +12702,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "železničná vlečka v závode"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "vedľajšia koľaj (napr: na stanici)"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "železničná vlečka"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnica"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upraviť úzkorozchodnú železnicu"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "Jednokoľajka, vysutá dráha"
@@ -12854,45 +12738,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Upraviť jednokoľajku, vysutú dráhu"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Historická železnica"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Upraviť zachovanú železnicu (v prevádzke)"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Rýchloelektrička"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Upraviť električku"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Upraviť metro"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Električka"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Upraviť električku"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Autobusová linka"
@@ -12900,5 +12784,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Upraviť autobusovú linku"
@@ -12907,14 +12791,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnica"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Upraviť nepoužívanú železnicu"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Opustená železnica"
@@ -12923,5 +12807,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Železničné priecestie"
@@ -12930,5 +12814,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Peší prechod cez železnicu"
@@ -12938,5 +12822,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr "Typy prechodov cez cestu"
@@ -12944,5 +12828,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Točňa"
@@ -12951,10 +12835,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Lanovka"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -12962,10 +12846,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Upraviť sedačkovú lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Lyžiarsky vlek Drag_lift(nepoužíva sa, použite piste:lift=platter)"
@@ -12973,5 +12857,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr ""
@@ -12979,5 +12863,5 @@
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Kabínková lanovka"
@@ -12985,24 +12869,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Upraviť kabínkovú lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Upraviť golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Stanica"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Upraviť stanicu"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Čerpacia stanica"
@@ -13012,5 +12909,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Upraviť čerpaciu stanicu"
@@ -13026,5 +12923,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -13034,5 +12931,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Upraviť parkovisko"
@@ -13040,40 +12937,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Kapacita"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "povrch"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "mnohoposchodový"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "podzemie"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "záchytné parkovisko so zastávkou MHD"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Miesta pre vozíčkárov"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Poplatok"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Umývačka"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Upraviť umývačku aut"
@@ -13081,5 +12979,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Obchod"
@@ -13087,15 +12985,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Upraviť obchod s autami"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Servis"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Upraviť autoservis"
@@ -13103,5 +13001,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Požičovňa"
@@ -13110,10 +13008,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Upraviť autopožičovňu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)"
@@ -13121,5 +13019,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)"
@@ -13127,5 +13025,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Upraviť parkovisko bicyklov"
@@ -13134,5 +13032,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Upraviť požičovňu bicyklov"
@@ -13141,15 +13039,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Upraviť bicyklový obchod"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -13157,5 +13055,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Železničná zastávka"
@@ -13163,5 +13061,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Upraviť zastávku"
@@ -13169,5 +13067,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Zastávka električky"
@@ -13176,5 +13074,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Upraviť zastávku električky"
@@ -13182,5 +13080,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Železničné nástupište"
@@ -13189,5 +13087,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Upraviť železničné nástupište"
@@ -13199,5 +13097,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "Referencie (číslo stopy(track))"
@@ -13205,10 +13103,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Oblasť"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -13217,10 +13115,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Upraviť vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Invalidný vozík"
@@ -13229,5 +13127,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Autobusová stanica"
@@ -13236,5 +13134,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Upraviť autobusovú stanicu"
@@ -13242,5 +13140,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Autobusová zastávka"
@@ -13250,5 +13148,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Upraviť autobusovú zastávku"
@@ -13256,10 +13154,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Autobusové nástupište"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Upraviť autobusové nástupište"
@@ -13267,5 +13165,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13273,5 +13171,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Upraviť stanicu taxíkov"
@@ -13279,5 +13177,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Letisko"
@@ -13285,15 +13183,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr "Upraviť letisko"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13302,5 +13200,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Ubytovanie"
@@ -13312,5 +13210,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -13319,15 +13217,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Upraviť hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Hviezdičkový"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motel"
@@ -13335,20 +13233,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Upraviť motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Penzión"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Upraviť penzión"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Chata"
@@ -13356,10 +13254,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Upraviť chatu"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Ubytovňa"
@@ -13367,30 +13265,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Upraviť ubytovňu"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Horská chata"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Upraviť horskú chatu"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Kemping pre obytné prívesy"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Upraviť kemping pre obytné prívesy"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Stanový tábor"
@@ -13398,10 +13296,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Upraviť stanový tábor"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Jedlo + Pitie"
@@ -13412,5 +13310,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Reštaurácia"
@@ -13418,5 +13316,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Upraviť reštauráciu"
@@ -13424,5 +13322,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Kuchyňa"
@@ -13430,61 +13328,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "talianska"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -13492,9 +13390,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -13502,10 +13400,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Upraviť kaviareň"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Krčma"
@@ -13513,20 +13411,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Upraviť krčmu"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -13534,10 +13432,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr "Upraviť bar (výčap)"
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -13545,20 +13443,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Upraviť nočný klub"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
@@ -13567,11 +13465,72 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Otváracia doba"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1630
+msgid "Museum"
+msgstr "Múzeum"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1632
+msgid "Edit Museum"
+msgstr "Upraviť múzeum"
+
+#. item "Tourism/Museum" text "Name"
+#: build/trans_presets.java:1636
+msgid "Zoo"
+msgstr "Zoo"
+
+#. item
+#. <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:1639
+msgid "Edit Zoo"
+msgstr "Upraviť zoo"
+
+#. item "Tourism/Zoo" text "Name"
+#: build/trans_presets.java:1643
+msgid "Viewpoint"
+msgstr "Výhliadka"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1645
+msgid "Edit Viewpoint"
+msgstr "Upraviť výhliadku"
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1648
+msgid "Look-Out Tower"
+msgstr "Výhliadková veža"
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1650
+msgid "Theme Park"
+msgstr "Zábavný park"
+
+#. item
+#: build/trans_presets.java:1651
+msgid "Edit Theme Park"
+msgstr "Upraviť zábavný park"
+
+#. item "Tourism/Theme Park" text "Name"
+#: build/trans_presets.java:1655
+msgid "Artwork"
+msgstr "Umelecké dielo"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1657
+msgid "Edit Artwork"
+msgstr "Upraviť umelecké dielo"
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1662
 msgid "Information Office"
 msgstr "Informačná kancelária"
@@ -13579,143 +13538,83 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1664
 msgid "Edit Information Office"
 msgstr "Upraviť informačnú kanceláriu"
 
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
-msgid "Museum"
-msgstr "Múzeum"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
-msgid "Edit Museum"
-msgstr "Upraviť múzeum"
-
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
-msgid "Zoo"
-msgstr "Zoo"
-
-#. item
-#. <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:1654
-msgid "Edit Zoo"
-msgstr "Upraviť zoo"
-
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
-msgid "Viewpoint"
-msgstr "Výhliadka"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
-msgid "Edit Viewpoint"
-msgstr "Upraviť výhliadku"
-
-#. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
-msgid "Look-Out Tower"
-msgstr "Výhliadková veža"
-
-#. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
-msgid "Theme Park"
-msgstr "Zábavný park"
-
-#. item
-#: build/trans_presets.java:1666
-msgid "Edit Theme Park"
-msgstr "Upraviť zábavný park"
-
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
-msgid "Artwork"
-msgstr "Umelecké dielo"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
-msgid "Edit Artwork"
-msgstr "Upraviť umelecké dielo"
-
-#. item "Tourism/Artwork" text "Name"
-#. <separator/>
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr "Typ mapy"
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr "mapa"
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr "mapa mesta"
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr "turistická mapa"
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr "cykloturistická mapa"
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr "Bližší popis"
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr "Informačná tabuľa"
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr "Typ tabuľe"
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr "tabuľa"
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr "história"
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr "príroda"
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr "divoká príroda"
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr "Informačné miesto (Turistika) (Guidepost (Hiking))"
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr "Typ mapy"
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr "mapa"
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr "mapa mesta"
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr "turistická mapa"
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr "cykloturistická mapa"
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr "Bližší popis"
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr "Informačná tabuľa"
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr "Typ tabuľe"
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr "tabuľa"
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr "história"
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr "príroda"
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr "divoká príroda"
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr "Ostatné(iné) informačné body(miesta)"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Prístrešok"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Upraviť prístrešok"
@@ -13723,25 +13622,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Ohnisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Výletné miesto"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Upraviť výletné miesto"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Hrad"
@@ -13750,20 +13649,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ruiny"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Upraviť ruiny"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -13772,20 +13671,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Upraviť archeologické nálezisko"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Bojisko"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Upraviť bojisko"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Pomník"
@@ -13793,56 +13704,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Bojisko"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Upraviť bojisko"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Oddych (Leisure)"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Ihrisko"
@@ -13850,15 +13750,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
@@ -13866,15 +13766,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -13888,6 +13788,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -13966,4 +13866,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14255,28 +14163,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "šport"
@@ -14286,68 +14195,68 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "bejzbal"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr ""
@@ -14355,162 +14264,162 @@
 "trávnika)"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "americký futbal"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -14549,191 +14458,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "športové centrum"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "štadión"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Cyklistika"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Lýžovanie"
@@ -14741,56 +14650,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "svah pre mierne pokročilých"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "pre pokročilých"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "Streľba"
@@ -14798,178 +14709,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Americký futbal"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Upraviť americký futbal"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Upraviť ragby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Budovy, stavby"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Budova"
@@ -14977,5 +14888,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -14983,10 +14894,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -14994,10 +14905,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -15005,10 +14916,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Súd"
@@ -15017,10 +14928,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Vezenie"
@@ -15029,10 +14940,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Polícia"
@@ -15042,10 +14953,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -15054,10 +14965,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Pošta"
@@ -15065,5 +14976,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -15071,15 +14982,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Škola"
@@ -15087,10 +14998,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Univerzita"
@@ -15098,10 +15009,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Vysoká škola"
@@ -15109,5 +15020,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -15115,5 +15026,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Kino"
@@ -15122,10 +15033,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Knižnica"
@@ -15134,10 +15045,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -15145,10 +15056,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Divadlo"
@@ -15157,10 +15068,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -15170,5 +15081,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -15177,6 +15088,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -15185,66 +15096,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "unitarianist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -15253,81 +15165,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Adresy"
@@ -15336,5 +15248,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Upraviť informácie o adrese"
@@ -15342,5 +15254,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Číslo domu"
@@ -15348,20 +15260,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Meno domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -15369,5 +15281,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -15376,5 +15288,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Upraviť interpoláciu adries"
@@ -15382,67 +15294,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "všetky"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "atletika"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Veža"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Maják"
@@ -15450,10 +15367,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -15461,10 +15378,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -15472,10 +15389,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -15485,10 +15402,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Žeriav"
@@ -15496,10 +15413,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -15507,10 +15424,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -15518,10 +15435,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -15529,5 +15446,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
@@ -15535,5 +15452,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -15543,39 +15460,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "plynová"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Elektráreň"
@@ -15584,10 +15501,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Upraviť elektráreň"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Podzemná elektráreň"
@@ -15596,5 +15513,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Upraviť podzemnú elektráreň"
@@ -15602,10 +15519,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Vežová solárna elektráreň"
@@ -15616,5 +15533,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Upraviť vežovú solárnu elektráreň"
@@ -15622,5 +15539,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -15629,25 +15546,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Napätie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Počet vodičov"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Toalety"
@@ -15655,25 +15572,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Referenčné číslo"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Poplatok"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telefón"
@@ -15682,5 +15594,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -15688,5 +15600,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Mince"
@@ -15694,5 +15606,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Bankovky"
@@ -15700,5 +15612,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -15706,5 +15618,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -15712,15 +15624,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -15729,5 +15641,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -15735,35 +15647,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Železný šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Lavička"
@@ -15772,20 +15684,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Skryť"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Zamknúť"
@@ -15793,22 +15705,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Fontána"
@@ -15817,10 +15729,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -15829,10 +15741,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -15840,25 +15752,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Upraviť supermarket"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -15866,10 +15778,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Upraviť obchod s polotovarmi"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Stánok"
@@ -15877,10 +15789,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Upraviť stánok"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -15888,5 +15800,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Upraviť predajný automat"
@@ -15894,88 +15806,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Mäsiareň"
@@ -15983,10 +15895,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Upraviť mäsiarstvo"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Chlieb a pečivo"
@@ -15994,10 +15906,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Upraviť chlieb a pečivo"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Kvetinárstvo"
@@ -16005,70 +15917,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Upraviť kvetinárstvo"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr "Biopotraviny"
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr "Upraviť biopotraviny"
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Škola"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Upravit obchod s obuvou"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Upraviť obchod s nápojmi"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Počítač"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Upraviť počítačový obchod"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Upraviť obchod s elektronikou"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Upraviť obchod s Hifi elektronikou"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Nábytok"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Upraviť obchod s nábytkom"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Záhradné centrum"
@@ -16076,10 +16002,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Upraviť záhradné centrum"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "Železiarstvo"
@@ -16087,10 +16013,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "Upraviť železiarstvo"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Obchod Urob si sám"
@@ -16098,60 +16024,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 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:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Papierníctvo"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Upraviť papierníctvo"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Kaderníctvo"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Upraviť kaderníctvo"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Obuva"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuvou"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Hračky"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Upraviť obchod s hračkami"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "Obchod s DVD"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "Upraviť obchod s DVD"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Chemická čistiareň"
@@ -16159,10 +16085,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Upraviť chemickú čistiareň"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Práčovňa"
@@ -16170,10 +16096,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Upraviť práčovňu"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Turistický (Outdoor)"
@@ -16181,35 +16107,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "Športový"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Šport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Upraviť športový obchod"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "Očná optika"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Upraviť očnú optiku"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Banka"
@@ -16217,5 +16145,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Upraviť banku"
@@ -16223,10 +16151,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -16234,5 +16162,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Upraviť zmenáreň"
@@ -16240,15 +16168,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Lekári"
@@ -16256,20 +16184,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Upraviť lekárov"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -16277,5 +16205,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Upraviť lekáreň"
@@ -16283,10 +16211,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "výdaj na recepty"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -16294,10 +16222,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -16306,5 +16234,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -16313,20 +16241,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Telefónne číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -16334,5 +16262,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -16341,25 +16269,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
@@ -16367,56 +16295,57 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Stav"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
-msgstr "Mesto"
-
-#. item
-#: build/trans_presets.java:2628
+msgstr "Mesto (city)"
+
+#. item
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
-msgstr "Mesto"
+msgstr "Mesto (town)"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Štvrť"
@@ -16424,30 +16353,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Dedina"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Malá dedina"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -16455,10 +16385,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Ostrov"
@@ -16466,5 +16396,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
@@ -16472,5 +16402,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -16478,10 +16408,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Upraviť vstup do jaskyne"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Vrchol"
@@ -16489,10 +16419,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Upraviť vrchol kopca"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -16500,10 +16430,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Upraviť ľadovec"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Sopka"
@@ -16511,70 +16441,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Upraviť sopku"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Štátna"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Občianske"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr "Politická"
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr "Národný park"
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 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:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Strom"
@@ -16583,15 +16513,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Drevo"
@@ -16600,5 +16530,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Upraviť Drevo"
@@ -16606,17 +16536,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "ihličnatý"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Les"
@@ -16625,288 +16555,40 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Upraviť les"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
-msgid "Farmyard"
-msgstr "Farma"
-
-#. item
-#. <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:2770
-msgid "Edit Farmyard Landuse"
-msgstr "Upraviť farmu"
-
-#. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
-msgid "Farmland"
-msgstr "Poľnohospodárska pôda"
-
-#. item
-#: build/trans_presets.java:2776
-msgid "Edit Farmland Landuse"
-msgstr "Upraviť poľnohospodárske pôdu"
-
-#. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
-msgid "Meadow"
-msgstr "Lúka"
-
-#. item
-#: build/trans_presets.java:2782
-msgid "Edit Meadow Landuse"
-msgstr "Upraviť lúku"
-
-#. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
-msgid "Vineyard"
-msgstr "Vinica"
-
-#. item
-#: build/trans_presets.java:2788
-msgid "Edit Vineyard Landuse"
-msgstr "Upraviť vinicu"
-
-#. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
-msgid "Allotments"
-msgstr "Ťažobný priestor"
-
-#. item
-#: build/trans_presets.java:2794
-msgid "Edit Allotments Landuse"
-msgstr "Upraviť ťažobný priestor"
-
-#. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
-msgid "Garden"
-msgstr "Záhrada"
-
-#. item
-#: build/trans_presets.java:2800
-msgid "Edit Garden"
-msgstr "Upraviť záhradu"
-
-#. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
-msgid "Grass"
-msgstr "Tráva"
-
-#. item
-#: build/trans_presets.java:2805
-msgid "Edit Grass Landuse"
-msgstr "Upraviť trávnatú plochu"
-
-#. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
-msgid "Village Green"
-msgstr "Obecná zeleň"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
-msgid "Edit Village Green Landuse"
-msgstr "Upraviť obecnú zeleň"
-
-#. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
-msgid "Common"
-msgstr "Spoločné, obecné"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
-msgid "Edit Common"
-msgstr "Upraviť spoločné, obecné"
-
-#. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
-msgid "Park"
-msgstr "Park"
-
-#. item
-#: build/trans_presets.java:2824
-msgid "Edit Park"
-msgstr "Upraviť park"
-
-#. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
-msgid "Recreation Ground"
-msgstr "Rekreačná oblasť"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
-msgid "Edit Recreation Ground Landuse"
-msgstr "Upraviť rekreačnú oblasť"
-
-#. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
-msgid "Residential area"
-msgstr "Osídlená oblasť (Residential area)"
-
-#. item
-#: build/trans_presets.java:2837
-msgid "Edit Residential Landuse"
-msgstr "Upraviť osídlenú oblasť"
-
-#. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
-msgid "Graveyard"
-msgstr "Cintorín"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
-msgid "Edit Graveyard"
-msgstr "Upraviť cintorín"
-
-#: build/trans_presets.java:2850
-msgid "Cemetery"
-msgstr "Cintorín"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
-msgid "Edit Cemetery Landuse"
-msgstr "Upraviť cintorín"
-
-#: build/trans_presets.java:2859
-msgid "Retail"
-msgstr "Maloobchod"
-
-#. item
-#: build/trans_presets.java:2860
-msgid "Edit Retail Landuse"
-msgstr "Upraviť oblasť s maloobchodmi"
-
-#. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
-msgid "Commercial"
-msgstr "Obchodná (komerčná)"
-
-#. item
-#: build/trans_presets.java:2866
-msgid "Edit Commercial Landuse"
-msgstr "Upraviť obchodnú (komerčnú) oblasť"
-
-#. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
-msgid "Industrial"
-msgstr "Priemysel"
-
-#. item
-#: build/trans_presets.java:2872
-msgid "Edit Industrial Landuse"
-msgstr "Upraviť priemyselnú oblasť"
-
-#. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
-msgid "Railway land"
-msgstr "Železničný pozemok"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
-msgid "Edit Railway Landuse"
-msgstr "Upraviť železničný pozemok"
-
-#. item "Land use/Railway land" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2885
-msgid "Brownfield"
-msgstr "Brownfield (opustený priemyselný objekt)"
-
-#. item
-#: build/trans_presets.java:2886
-msgid "Edit Brownfield Landuse"
-msgstr "Upraviť brownfield (opustený priemyselný objekt)"
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
-msgid "Greenfield"
-msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
-
-#. item
-#: build/trans_presets.java:2892
-msgid "Edit Greenfield Landuse"
-msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "Stavebná oblasť"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "Upraviť stavebnú oblasť"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
-msgid "Landfill"
-msgstr "Skládka odpadov"
-
-#. item
-#: build/trans_presets.java:2904
-msgid "Edit Landfill Landuse"
-msgstr "Upraviť skládku odpadov"
-
-#. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
-msgid "Quarry"
-msgstr "Lom"
-
-#. item
-#: build/trans_presets.java:2910
-msgid "Edit Quarry Landuse"
-msgstr "Upraviť lom"
-
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Armáda"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Upraviť vojenskú oblasť"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2773
 msgid "Scree"
 msgstr "Sutina"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2774
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2778
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2779
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:2783
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -16914,5 +16596,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2785
 msgid "Edit Fell"
 msgstr ""
@@ -16920,5 +16602,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2789
 msgid "Heath"
 msgstr "Vresovisko"
@@ -16926,10 +16608,260 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2791
 msgid "Edit Heath"
 msgstr "Upraviť vresovisko"
 
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
+msgid "Farmyard"
+msgstr "Farma"
+
+#. item
+#. <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:2799
+msgid "Edit Farmyard Landuse"
+msgstr "Upraviť farmu"
+
+#. item "Land use/Farmyard" text "Name"
+#: build/trans_presets.java:2804
+msgid "Farmland"
+msgstr "Poľnohospodárska pôda"
+
+#. item
+#: build/trans_presets.java:2805
+msgid "Edit Farmland Landuse"
+msgstr "Upraviť poľnohospodárske pôdu"
+
+#. item "Land use/Farmland" text "Name"
+#: build/trans_presets.java:2810
+msgid "Meadow"
+msgstr "Lúka"
+
+#. item
+#: build/trans_presets.java:2811
+msgid "Edit Meadow Landuse"
+msgstr "Upraviť lúku"
+
+#. item "Land use/Meadow" text "Name"
+#: build/trans_presets.java:2816
+msgid "Vineyard"
+msgstr "Vinica"
+
+#. item
+#: build/trans_presets.java:2817
+msgid "Edit Vineyard Landuse"
+msgstr "Upraviť vinicu"
+
+#. item "Land use/Vineyard" text "Name"
+#: build/trans_presets.java:2822
+msgid "Allotments"
+msgstr "Ťažobný priestor"
+
+#. item
+#: build/trans_presets.java:2823
+msgid "Edit Allotments Landuse"
+msgstr "Upraviť ťažobný priestor"
+
+#. item "Land use/Allotments" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2829
+msgid "Garden"
+msgstr "Záhrada"
+
+#. item
+#: build/trans_presets.java:2830
+msgid "Edit Garden"
+msgstr "Upraviť záhradu"
+
+#. item "Land use/Garden" text "Name"
+#: build/trans_presets.java:2834
+msgid "Grass"
+msgstr "Tráva"
+
+#. item
+#: build/trans_presets.java:2835
+msgid "Edit Grass Landuse"
+msgstr "Upraviť trávnatú plochu"
+
+#. item "Land use/Grass" text "Name"
+#: build/trans_presets.java:2840
+msgid "Village Green"
+msgstr "Obecná zeleň"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
+#: build/trans_presets.java:2842
+msgid "Edit Village Green Landuse"
+msgstr "Upraviť obecnú zeleň"
+
+#. item "Land use/Village Green" text "Name"
+#: build/trans_presets.java:2847
+msgid "Common"
+msgstr "Spoločné, obecné"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
+#: build/trans_presets.java:2849
+msgid "Edit Common"
+msgstr "Upraviť spoločné, obecné"
+
+#. item "Land use/Common" text "Name"
+#: build/trans_presets.java:2853
+msgid "Park"
+msgstr "Park"
+
+#. item
+#: build/trans_presets.java:2854
+msgid "Edit Park"
+msgstr "Upraviť park"
+
+#. item "Land use/Park" text "Name"
+#: build/trans_presets.java:2858
+msgid "Recreation Ground"
+msgstr "Rekreačná oblasť"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
+#: build/trans_presets.java:2860
+msgid "Edit Recreation Ground Landuse"
+msgstr "Upraviť rekreačnú oblasť"
+
+#. item "Land use/Recreation Ground" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2866
+msgid "Residential area"
+msgstr "Osídlená oblasť (Residential area)"
+
+#. item
+#: build/trans_presets.java:2867
+msgid "Edit Residential Landuse"
+msgstr "Upraviť osídlenú oblasť"
+
+#. item "Land use/Residential area" text "Name"
+#: build/trans_presets.java:2872
+msgid "Graveyard"
+msgstr "Cintorín"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
+#: build/trans_presets.java:2874
+msgid "Edit Graveyard"
+msgstr "Upraviť cintorín"
+
+#: build/trans_presets.java:2880
+msgid "Cemetery"
+msgstr "Cintorín"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+#: build/trans_presets.java:2882
+msgid "Edit Cemetery Landuse"
+msgstr "Upraviť cintorín"
+
+#: build/trans_presets.java:2889
+msgid "Retail"
+msgstr "Maloobchod"
+
+#. item
+#: build/trans_presets.java:2890
+msgid "Edit Retail Landuse"
+msgstr "Upraviť oblasť s maloobchodmi"
+
+#. item "Land use/Retail" text "Name"
+#: build/trans_presets.java:2895
+msgid "Commercial"
+msgstr "Obchodná (komerčná)"
+
+#. item
+#: build/trans_presets.java:2896
+msgid "Edit Commercial Landuse"
+msgstr "Upraviť obchodnú (komerčnú) oblasť"
+
+#. item "Land use/Commercial" text "Name"
+#: build/trans_presets.java:2901
+msgid "Industrial"
+msgstr "Priemysel"
+
+#. item
+#: build/trans_presets.java:2902
+msgid "Edit Industrial Landuse"
+msgstr "Upraviť priemyselnú oblasť"
+
+#. item "Land use/Industrial" text "Name"
+#: build/trans_presets.java:2907
+msgid "Railway land"
+msgstr "Železničný pozemok"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
+#: build/trans_presets.java:2909
+msgid "Edit Railway Landuse"
+msgstr "Upraviť železničný pozemok"
+
+#. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Armáda"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Upraviť vojenskú oblasť"
+
+#. item "Land use/Military" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "Stavebná oblasť"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "Upraviť stavebnú oblasť"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
+msgid "Brownfield"
+msgstr "Brownfield (opustený priemyselný objekt)"
+
+#. item
+#: build/trans_presets.java:2928
+msgid "Edit Brownfield Landuse"
+msgstr "Upraviť brownfield (opustený priemyselný objekt)"
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:2933
+msgid "Greenfield"
+msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
+
+#. item
+#: build/trans_presets.java:2934
+msgid "Edit Greenfield Landuse"
+msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:2939
+msgid "Landfill"
+msgstr "Skládka odpadov"
+
+#. item
+#: build/trans_presets.java:2940
+msgid "Edit Landfill Landuse"
+msgstr "Upraviť skládku odpadov"
+
+#. item "Land use/Landfill" text "Name"
+#: build/trans_presets.java:2945
+msgid "Quarry"
+msgstr "Lom"
+
+#. item
+#: build/trans_presets.java:2946
+msgid "Edit Quarry Landuse"
+msgstr "Upraviť lom"
+
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -16939,5 +16871,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -16946,10 +16878,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -16957,5 +16889,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -16964,5 +16896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -16970,34 +16902,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -17006,15 +16938,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "k ceste"
@@ -17022,5 +16954,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -17029,5 +16961,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -17035,5 +16967,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
@@ -17105,24 +17037,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "bicykel"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr "lyžovanie"
@@ -17167,4 +17099,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17174,19 +17109,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr "turistika"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr "obchádzka"
@@ -17200,10 +17136,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -17211,26 +17147,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -17239,30 +17175,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
@@ -17446,4 +17382,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17455,4 +17498,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17554,11 +17606,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "zastaralý"
@@ -17600,7 +17654,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "koňská (horse)"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Prekážka (Barriers)"
 
 #. color tertiary
@@ -17636,6 +17905,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "ulica"
@@ -17691,7 +17960,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "cesta (highway_track)"
@@ -17738,108 +18007,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "koľajnica (rail)"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viadukt (nadjazd)"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17856,4 +18038,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "obslužná (service)"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17863,4 +18051,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Brod"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17877,8 +18071,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "Pohotovosť (Záchranná služba)"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17890,5 +18098,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "riečny breh"
@@ -17902,5 +18110,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "potok"
@@ -17914,5 +18122,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "dok (nakladacia rampa)"
@@ -17940,5 +18148,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "akvadukt"
@@ -17953,4 +18161,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17990,5 +18199,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18105,12 +18314,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "človekom vytvorené (manmade)"
@@ -18156,5 +18366,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18172,7 +18382,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr "železničná výhybka"
@@ -18195,10 +18405,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr "iná koľaj"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr "nadchod nad železnicou"
@@ -18228,6 +18438,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr "historická železnica(turistická)"
@@ -18272,6 +18482,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "letecké cesty"
@@ -18285,5 +18495,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminál"
@@ -18305,5 +18515,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "zjazdovka_čierna"
@@ -18317,5 +18527,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "zjazdovka_ľahká"
@@ -18338,4 +18548,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18355,4 +18573,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "Visuté cesty/Lanovky"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18361,23 +18585,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "Visuté cesty/Lanovky"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "mierna zjazdovka (piste_easy)"
@@ -18391,5 +18602,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "stredne ťažká zjazdovka (piste_intermediate)"
@@ -18403,5 +18615,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "zjazdovka pre pokročilých (piste_advanced)"
@@ -18414,6 +18627,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "zjazdovka pre freeride (piste_freeride)"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "zjazdovka pre freeride (piste_freeride)"
@@ -18427,5 +18655,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "zjazdovka pre začiatočníkov (piste_novice)"
@@ -18456,4 +18685,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18488,4 +18725,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18498,8 +18759,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "energia (power)"
@@ -18512,5 +18775,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "hrádza (pier)"
@@ -18524,5 +18790,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "potrubie (pipeline)"
@@ -18650,12 +18916,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -18669,5 +18935,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "prístav (marina)"
@@ -18739,8 +19005,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "zaujímavosti (amenity)"
@@ -18776,4 +19042,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18833,11 +19107,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "verejná_doprava"
@@ -18976,6 +19250,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19202,22 +19497,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "svetelné zariadenie"
@@ -19249,6 +19544,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "osvetlená_voda (light_water)"
@@ -19284,4 +19579,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19301,7 +19604,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "zdravie"
@@ -19395,4 +19699,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19595,4 +19907,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19626,28 +19954,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "obchod"
@@ -19701,4 +20031,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19711,8 +20049,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotel"
@@ -19767,4 +20105,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19861,9 +20200,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "cestovanie"
@@ -19935,8 +20274,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "historické"
@@ -20006,9 +20345,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "zelená"
@@ -20022,5 +20361,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "lom"
@@ -20034,5 +20373,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "skládka odpadov (landfill)"
@@ -20054,5 +20393,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -20066,5 +20405,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "les"
@@ -20078,5 +20417,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "farmy"
@@ -20099,5 +20438,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "maloobchody"
@@ -20111,5 +20450,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "závody"
@@ -20123,5 +20462,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "brownfield (opustený priemyselný objekt)"
@@ -20135,5 +20474,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -20147,5 +20486,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "železničný pozemok"
@@ -20202,7 +20541,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "armáda"
@@ -20216,5 +20555,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "cintorín (cemetery)"
@@ -20227,5 +20566,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "vrchol (peak)"
@@ -20240,5 +20579,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "ľadovec (glacier)"
@@ -20252,5 +20591,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "sopka"
@@ -20265,4 +20604,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20304,7 +20644,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "prírodné (natural)"
@@ -20318,5 +20659,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "oblasť pokrytá krovím"
@@ -20330,5 +20671,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "vresovisko"
@@ -20342,5 +20683,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "drevo (wood)"
@@ -20354,5 +20695,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "blato (mud)"
@@ -20366,5 +20707,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "pláž (beach)"
@@ -20442,8 +20783,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "trasa (route)"
@@ -20491,7 +20832,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "hranica (boundary)"
@@ -20633,10 +20974,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "miesto"
@@ -20677,6 +21018,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "adresa"
@@ -20958,186 +21306,51 @@
 msgstr "Ulice NRW Geofabrik.de"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr ""
-#~ "Ak váš GPS prístroj kreslí príliš široké čiary, vyberte ich na kreslenie "
-#~ "pozdĺž vašej cesty."
-
-#~ msgid "Navigate"
-#~ msgstr "Navigovať"
-
-#~ msgid "Navigator"
-#~ msgstr "Navigátor"
-
-#~ msgid "Set start/end for routing. Middle mouse button to reset."
-#~ msgstr ""
-#~ "Nastaviť začiatok/koniec pre trasu(routing). Stredné tlačítko myši "
-#~ "vynuluje(reset)."
-
-#~ msgid "Reset Graph"
-#~ msgstr "Vynulovať Graf"
-
-#~ msgid "Provides navigation/autorouting functionality"
-#~ msgstr "Určiť navigation/autorouting účelovosť"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Zvoľte niečo zo zoznamu konfliktov"
-
-#~ msgid "Please select a color."
-#~ msgstr "Prosím zvoľte farbu."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Nespúšťať v celoobrazovkovom režime"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Novinky o JOSM"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Kľuknite pre vytvorenie novej cesty v existujúcom bode"
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Vytvorte spojenie v existujúcom bode"
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Kľuknite k vloženiu bodu a vytvoreniu novej cesty."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Vložte nový bod a vytvor nové spojenie"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Nahrať túto stopu..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Táto funkcia bola pridaná nedávno. Prosíme,<br>používajte opatrne a "
-#~ "presvedčte sa, že sa chová tak, ako to očakávate.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Nahrať trasu filtrovanú JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Nahrať súbor nekomprimovaných (raw) dát: "
-
-#~ msgid "Description:"
-#~ msgstr "Popis:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Značky (kľúčové slová v GPX súbore)"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "Nahrať GPX"
-
-#~ msgid "time"
-#~ msgstr "čas"
-
-#~ msgid "desc"
-#~ msgstr "popis"
-
-#~ msgid "symbol"
-#~ msgstr "symbol"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Nahrať súbor {0} s nekomprimovanými (raw) dátami"
-
-#~ msgid "Tags:"
-#~ msgstr "Značky:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "Vyberte odtieň farby pre stopu(track), podľa rýchlosti na bode."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Upraviť výjazd z diaľnice"
-
-#~ msgid "Exit Number"
-#~ msgstr "Číslo výjazdu"
-
-#~ msgid "Exit Name"
-#~ msgstr "Názov výjazdu"
-
-#~ msgid "Waterway"
-#~ msgstr "Vodná cesta"
-
-#~ msgid "Information point"
-#~ msgstr "Informačná tabuľa"
-
-#~ msgid "political"
-#~ msgstr "politické"
-
-#~ msgid "National_park"
-#~ msgstr "Národný park (prírodná rezervácia)"
-
-#~ msgid "Natural"
-#~ msgstr "Prírodný"
-
-#~ msgid "Add Site"
-#~ msgstr "Pridať stránku"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Zmazať stránku(y)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Prosím vyberte stránku pre zmazanie."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Kontrolovať stránku(y)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "Vyberte stránku(y) pre kontrolu na aktualizáciu."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Pridať novú stránku s pluginmi."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Zmazať zvolenú stránku(y) zo zoznamu."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr "Kontrolovať zvolenú stránku(y) pre nové pluginy a aktualizácie."
-
-#~ msgid "Update Sites"
-#~ msgstr "Stránka aktualizácií"
-
-#~ msgid "Version"
-#~ msgstr "Verzia"
-
-#~ msgid "Install"
-#~ msgstr "Nainštalovať"
-
-#~ msgid "Signpost"
-#~ msgstr "Smerová tabuľa"
-
-#~ msgid "office"
-#~ msgstr "kancelária (úrad)"
-
-#~ msgid "guidepost"
-#~ msgstr "informačné smerové tabule (smer k objektom, firmám, uliciam v obci)"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Aktualizačné miesto(stránka) URL"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Chybná URL"
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "Cesta \"{0}\" musí obsahovať aspoň 2 body."
-
-#~ msgid "Upload GPX track"
-#~ msgstr "Nahrať GPX stopu (track)"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "Koľko budov je v rade."
-
-#~ msgid "Update available"
-#~ msgstr "Aktualizácia je dostupná"
-
-#~ msgid "Version Details:"
-#~ msgstr "Detaily verzie:"
-
-#~ msgid ""
-#~ "Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">(latest "
-#~ "untested: {1} &#150; not recommended)</font>"
-#~ msgstr ""
-#~ "Váš: {2}; Aktuálny: {0}; <font style=\"font-size:x-small\">(posledný "
-#~ "netestovaný: {1} &#150; nedoporučený)</font>"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Otvoriť..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Popis"
+
+#~ msgid "Commit comment"
+#~ msgstr "Poslať komentár"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Server neobsahuje kontroly"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Naozaj označiť tento problém ako \"hotový\"?"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigácia"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "Odstrániť trasové body"
+
+#~ msgid "Start routing"
+#~ msgstr "Začať trasovanie"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Padací most"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Upraviť padací most"
+
+#~ msgid "Portcullis"
+#~ msgstr "Mreže"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Upraviť mreže"
+
+#~ msgid "Charge"
+#~ msgstr "Poplatok"
+
+#~ msgid "sports"
+#~ msgstr "Športový"
+
+#~ msgid "viaduct"
+#~ msgstr "viadukt (nadjazd)"
Index: /applications/editors/josm/i18n/po/sl.po
===================================================================
--- /applications/editors/josm/i18n/po/sl.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/sl.po	(revision 14844)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-24 16:49+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-03-31 16:24+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,9 +17,9 @@
 "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-03-31 14:54+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Priprava grafičnega uporabniškega vmesnika"
@@ -37,5 +37,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
@@ -43,34 +43,34 @@
 "strežnik."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Neshranjene spremembe"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -81,10 +81,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -95,4 +95,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -102,10 +103,10 @@
 msgstr "Prekliči"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -131,8 +132,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -273,5 +274,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -405,6 +406,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -412,20 +413,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Združi {0} poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -525,5 +526,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -642,6 +643,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -650,6 +651,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -772,9 +773,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 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:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1046,5 +1047,5 @@
 msgstr "Shrani trenutne podatke"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1052,26 +1053,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Dokument ni odprt, zato ni kaj shraniti."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Prazen dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "V sporu z"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1079,32 +1080,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Shrani datoteko GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Shrani datoteko OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Neznana končnica datoteke."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr ""
@@ -1159,18 +1160,18 @@
 msgstr "Zapri"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Razdeli pot pri izbranem vozlišču."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1178,5 +1179,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1188,9 +1189,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1198,10 +1199,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1209,5 +1210,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1215,5 +1216,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1359,46 +1360,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Pošlji v OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Pošlji vse spremembe na strežnik OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Novi predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Spremenjeni predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Izbrisani predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Pošljem te spremembe?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Ni česa poslati. Najprej pridobite kakšne podatke."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Obstajajo nerazrešeni konflikti. Razrešite jih."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Ni sprememb za pošiljanje."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Pošiljanje podatkov"
@@ -1581,31 +1586,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Dodaj vozlišče"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Dodaj vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Dodaj novo vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Dodaj in poveži vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr ""
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1614,9 +1621,4 @@
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2024,5 +2026,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2221,5 +2223,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "železnica"
@@ -2243,127 +2245,127 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznana vloga ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "besedilo"
@@ -2371,5 +2373,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2399,5 +2401,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "ozadje"
@@ -2454,5 +2456,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2466,5 +2468,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2496,14 +2498,14 @@
 msgstr "končna različica:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Sporočilo dneva ni na voljo"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -2569,71 +2571,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Uporabniško ime"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Geslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+msgid "usage"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+msgid "options"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
-msgid "usage"
+msgid "Show this help"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
+msgid "Standard unix geometry argument"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
-msgid "options"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
-msgid "Show this help"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
-msgid "Standard unix geometry argument"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box"
 msgstr "Sprejmi pravokotno področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Sprejmi pravokotno področje GPS podatkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Ponastavi nastavitve na privzete"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Nastavi jezik."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2641,23 +2643,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Aktiviranje posodobljenih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Nalaganje zgodnjih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Nalaganje vstavkov"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2835,5 +2842,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3046,5 +3053,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Vloga"
@@ -3092,73 +3099,71 @@
 msgstr "Lastnosti / Članstva"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Ustvari novo relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Uredi novo relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Uredi relacijo #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Osnovno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Član"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Člani"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Pomakni izbranega člana vrstico višje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Dodaj izbrano"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Dodaj kot člane vse trenutno izbrane predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Odstrani izbrano"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Pomakni izbranega člana vrstico nižje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3167,36 +3172,36 @@
 msgstr "Odstrani"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Člani: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr ""
@@ -3210,10 +3215,11 @@
 msgstr "Izbriši izbrano relacijo"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relacije"
@@ -3404,5 +3410,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Kraji"
@@ -3449,21 +3455,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "vrsta"
@@ -3517,10 +3523,7 @@
 "Za premikanje in povečavo lahko uporabite miško ali <ctrl>+<smerne tipke>."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Zemljevid"
@@ -3676,4 +3679,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3777,5 +3781,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3834,19 +3838,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "izven sprejetega področja"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Različica {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} je sestavljen iz:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} izbrisan.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "Ruševine"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Različica {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3854,21 +3873,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4296,5 +4315,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4379,4 +4398,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4460,7 +4481,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4473,7 +4491,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4489,10 +4514,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4661,5 +4686,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4693,7 +4720,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4777,4 +4804,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4827,4 +4862,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4833,7 +4874,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4842,15 +4880,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4875,129 +4902,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Naziv"
@@ -5046,12 +5075,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Naloži vse ploščice"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "brez"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5078,45 +5105,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Avtomobil"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Kolo"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5124,25 +5141,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr ""
@@ -5190,7 +5212,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Riši črte med točkami GPS sledi."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5795,10 +5816,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Pripravljam podatke..."
@@ -5808,25 +5829,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Ni sprememb za pošiljanje."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Pripravljanje..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Pošiljanje ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+msgid "Error processing changeset upload response"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Neznan gostitelj"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Napačno uporabniško ime ali geslo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Pozor: Geslo se prenaša nekriptirano"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Shrani uporabniško ime in geslo (nekriptirano)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Vnesite geslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5837,44 +5907,52 @@
 msgstr "Napaka med razčlenjevanjem."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Neznana različica"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Neznana različica"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "predmet z id=0 ni dovoljen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Priprava podatkov OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Neveljaven id točke"
@@ -5884,5 +5962,5 @@
 msgstr "Vzpostavljanje povezave s strežnikom..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -5891,5 +5969,5 @@
 "internetom."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5897,55 +5975,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Neznan gostitelj"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Pripravljanje..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Pošiljanje ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Prenos prekinjen zaradi napake (5 sekund premora):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6116,6 +6147,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "neznan"
@@ -6291,7 +6322,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Ustvari površine"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6310,7 +6340,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Ustvari površine"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6334,5 +6363,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Opis"
@@ -7566,7 +7595,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr ""
@@ -7861,5 +7890,5 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr ""
@@ -7876,4 +7905,11 @@
 msgstr ""
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr ""
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -7899,34 +7935,37 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
-msgstr ""
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
 msgstr ""
 
@@ -7956,5 +7995,5 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -7962,9 +8001,9 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr ""
@@ -8032,78 +8071,63 @@
 msgstr ""
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr ""
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
-#, fuzzy
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 msgid "Routing"
-msgstr "Nič"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-msgid "Click to add route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-msgid "Click and drag to move route nodes."
-msgstr ""
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Odstrani izbrano"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
+msgid "Click to add destination."
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "Odpri seznam vseh relacij."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Postaja"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+msgid "Add routing layer"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "regionalna (turistična)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Gozd"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Hitreje"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Obrni smer poti"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Pot trajekta"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Nastavitve WMS vstavka"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Nastavi vire vstavkov"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
@@ -8112,7 +8136,6 @@
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Najvišja hitrost (km/h)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
@@ -8124,33 +8147,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Naloži ploščico"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Prikaži stanje ploščice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Zahtevaj posodobitev"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Naloži vse ploščice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "slika ni naložena"
@@ -8173,34 +8196,34 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Viri ploščic"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "napaka pri oddaji zahtevka za pososobitev"
@@ -8215,5 +8238,5 @@
 msgstr "Vsako minuto shrani zajete podatke v datoteko."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8268,7 +8291,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Uredi jez"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8283,7 +8305,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "brez"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
@@ -8295,21 +8316,17 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Spremeni lastnosti do {0} predmetov"
-msgstr[1] "Spremeni lastnosti do {0} predmeta"
-msgstr[2] "Spremeni lastnosti do {0} predmetov"
-msgstr[3] "Spremeni lastnosti do {0} predmetov"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Spremeni lastnosti do {0} predmetov"
-msgstr[1] "Spremeni lastnosti do {0} predmeta"
-msgstr[2] "Spremeni lastnosti do {0} predmetov"
-msgstr[3] "Spremeni lastnosti do {0} predmetov"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
@@ -8318,25 +8335,21 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Potok"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Iskanje"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Datoteka"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Avtomobil"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8420,5 +8433,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Ime ceste"
@@ -8520,17 +8533,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relacije"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Prekrivajoče površine"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Prekrivajoče površine"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8541,12 +8551,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Spori pri zlivanju"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "odstrani iz izbora"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8555,17 +8563,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Združi poti"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Odstrani fotografijo iz plasti"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Avtocestno križišče"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9146,4 +9151,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9225,7 +9236,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "zgradba"
@@ -9239,5 +9250,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr ""
@@ -9509,4 +9520,9 @@
 msgstr ""
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9533,7 +9549,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Ustvari površine"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9624,21 +9639,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9647,15 +9669,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9665,15 +9687,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9682,5 +9704,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9689,5 +9711,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9696,5 +9718,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9784,5 +9806,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr ""
@@ -9837,7 +9859,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Plast"
@@ -9880,5 +9902,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Najvišja hitrost (km/h)"
@@ -9926,5 +9948,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Enosmerna"
@@ -9980,5 +10002,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -10028,5 +10050,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Predor"
@@ -10073,5 +10095,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Usek"
@@ -10118,5 +10140,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Nasip"
@@ -10274,6 +10296,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr ""
@@ -10322,5 +10344,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Površina"
@@ -10352,5 +10374,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr ""
@@ -10361,5 +10383,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr ""
@@ -10373,5 +10395,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr ""
@@ -10523,5 +10545,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10542,6 +10564,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "da"
@@ -10685,7 +10707,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr ""
@@ -10699,73 +10721,63 @@
 msgstr ""
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr ""
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr ""
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr ""
@@ -10840,130 +10852,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Vrsta"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10971,5 +10871,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10977,11 +10877,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10989,5 +10883,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -10995,5 +10889,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11001,5 +10895,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11007,6 +10901,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11025,6 +10925,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr ""
@@ -11050,6 +10950,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "hitra cesta"
@@ -11075,6 +10975,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "glavna"
@@ -11100,6 +11000,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "regionalna"
@@ -11113,5 +11013,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "regionalna (turistična)"
@@ -11129,5 +11029,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr ""
@@ -11145,5 +11045,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr ""
@@ -11170,6 +11070,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr ""
@@ -11210,6 +11110,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11220,5 +11119,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "krožišče"
@@ -11562,14 +11461,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr ""
@@ -11594,20 +11493,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11615,5 +11514,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11622,5 +11521,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11630,5 +11529,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11777,10 +11676,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr ""
@@ -11793,29 +11693,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr ""
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Stebriček"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr ""
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11824,7 +11713,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11833,75 +11725,43 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr ""
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
-msgid "Kissing Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:839
-msgid "Edit Kissing Gate"
-msgstr ""
-
-#. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr ""
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Stebriček"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr ""
-
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr ""
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
 msgid "Cattle Grid"
 msgstr "Rešetka za živino"
@@ -11909,30 +11769,98 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
+#: build/trans_presets.java:851
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:865
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Uredi dók"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Cestninska postaja"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Uredi cestninsko postajo"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr ""
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr ""
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
 msgid "Gate"
 msgstr "Vrata"
@@ -11940,128 +11868,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
+#: build/trans_presets.java:937
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
+#: build/trans_presets.java:948
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:934
+#: build/trans_presets.java:949
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
+msgid "Kissing Gate"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:985
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr ""
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Cestninska postaja"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Uredi cestninsko postajo"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr ""
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr ""
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Izvir"
@@ -12069,5 +11949,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Uredi izvir"
@@ -12075,5 +11955,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr ""
@@ -12081,10 +11961,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Potok"
@@ -12092,10 +11972,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Uredi potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Kanal"
@@ -12103,10 +11983,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Uredi kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Reka"
@@ -12116,5 +11996,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Uredi reko"
@@ -12122,15 +12002,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Uredi vodo"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Kopno"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Uredi kopno"
@@ -12138,31 +12018,31 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1073
+msgid "Basin"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1074
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Basin" text "Name"
+#: build/trans_presets.java:1079
+msgid "Reservoir"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1081
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Reservoir" text "Name"
+#: build/trans_presets.java:1086
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1087
-msgid "Basin"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1088
-msgid "Edit Basin Landuse"
-msgstr ""
-
-#. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
-msgid "Reservoir"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
-msgid "Edit Reservoir Landuse"
-msgstr ""
-
-#. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
-msgid "Covered Reservoir"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1101
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -12170,5 +12050,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr ""
@@ -12177,10 +12057,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr ""
@@ -12191,77 +12071,77 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
+#: build/trans_presets.java:1107
+msgid "swamp"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "bog"
+msgstr ""
+
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_presets.java:1107 build/trans_style.java:3326
+msgid "marsh"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "reedbed"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "saltmarsh"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "tidalflat"
+msgstr ""
+
+#: build/trans_presets.java:1107
+msgid "mangrove"
+msgstr ""
+
+#: build/trans_presets.java:1109
+msgid "Mud"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1110
+msgid "Edit Mud"
+msgstr ""
+
+#. item "Water/Mud" text "Name"
+#: build/trans_presets.java:1114
+msgid "Beach"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
+#: build/trans_presets.java:1116
+msgid "Edit Beach"
+msgstr ""
+
+#. item "Water/Beach" text "Name"
+#: build/trans_presets.java:1120
+msgid "Bay"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1121
-msgid "swamp"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "bog"
-msgstr ""
-
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
-msgid "marsh"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "reedbed"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "saltmarsh"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "tidalflat"
-msgstr ""
-
-#: build/trans_presets.java:1121
-msgid "mangrove"
-msgstr ""
-
-#: build/trans_presets.java:1123
-msgid "Mud"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1124
-msgid "Edit Mud"
-msgstr ""
-
-#. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
-msgid "Beach"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
-msgid "Edit Beach"
-msgstr ""
-
-#. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
-msgid "Bay"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1135
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr ""
@@ -12269,10 +12149,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr ""
@@ -12280,5 +12160,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr ""
@@ -12286,5 +12166,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Pot trajekta"
@@ -12292,5 +12172,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr ""
@@ -12299,5 +12179,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Ladjedelnica"
@@ -12305,10 +12185,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Uredi ladjedelnico"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Dók"
@@ -12316,5 +12196,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Uredi dók"
@@ -12322,5 +12202,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Jez"
@@ -12328,15 +12208,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Uredi jez"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Vodna točka"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Vodna zapornica"
@@ -12345,5 +12225,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr ""
@@ -12351,20 +12231,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Slap"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Uredi slap"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Obračališče"
@@ -12373,15 +12253,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Pomol"
@@ -12389,10 +12269,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Uredi pomol"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr ""
@@ -12400,10 +12280,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr ""
@@ -12413,5 +12293,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr ""
@@ -12419,10 +12299,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Železniški tir"
@@ -12430,5 +12310,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Uredi železniški tir"
@@ -12458,8 +12338,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Vrsta (neobvezno)"
@@ -12473,81 +12353,81 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Tir ozkotirne železnice"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Uredi tir ozkotirne železnice"
 
+#: build/trans_presets.java:1234
+msgid "Monorail"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1236
+msgid "Edit Monorail"
+msgstr ""
+
+#: build/trans_presets.java:1241
+msgid "Preserved"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1242
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#: build/trans_presets.java:1247
+msgid "Light Rail"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1248
-msgid "Monorail"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1255
-msgid "Preserved"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1256
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1261
-msgid "Light Rail"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1262
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Podzemna"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Uredi podzemno"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr ""
@@ -12555,5 +12435,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -12562,14 +12442,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Nerabljen tir"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Uredi nerabljen tir"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Zapuščeni tir"
@@ -12578,5 +12458,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr ""
@@ -12585,5 +12465,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr ""
@@ -12593,5 +12473,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12599,5 +12479,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Okretnica"
@@ -12606,10 +12486,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Žičnica"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Sedežnica"
@@ -12617,10 +12497,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Uredi sedežnico"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Vlečnica"
@@ -12628,10 +12508,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Uredi vlečnico"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Kabinska žičnica"
@@ -12639,24 +12519,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Uredi kabinsko žičnico"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Uredi golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Postaja"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Uredi postajo"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Gorivo"
@@ -12666,5 +12559,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Uredi gorivo"
@@ -12680,5 +12573,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12688,5 +12581,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Uredi parkirišče"
@@ -12694,40 +12587,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr ""
@@ -12735,5 +12629,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr ""
@@ -12741,15 +12635,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr ""
@@ -12757,5 +12651,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Izposojevalnica"
@@ -12764,10 +12658,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Uredi izposojevalnico avtomobilov"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr ""
@@ -12775,5 +12669,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr ""
@@ -12781,5 +12675,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -12788,5 +12682,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Uredi izposojevalnico koles"
@@ -12795,15 +12689,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Javni prevoz"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr ""
@@ -12811,5 +12705,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Železniško postajališče"
@@ -12817,5 +12711,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr ""
@@ -12823,5 +12717,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr ""
@@ -12830,5 +12724,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr ""
@@ -12836,5 +12730,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Železniški peron"
@@ -12843,5 +12737,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Uredi železniški peron"
@@ -12853,5 +12747,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr ""
@@ -12859,10 +12753,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Vhod v podzemno"
@@ -12871,10 +12765,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Uredi vhod v podzemno"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr ""
@@ -12883,5 +12777,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Avtobusna postaja"
@@ -12890,5 +12784,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Uredi avtobusno postajo"
@@ -12896,5 +12790,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Avtobusno postajališče"
@@ -12904,5 +12798,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Uredu avtobusno postajališče"
@@ -12910,10 +12804,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Avtobusni peron"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Uredi avtobusni peron"
@@ -12921,5 +12815,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taksi"
@@ -12927,5 +12821,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Uredi postajališče taksijev"
@@ -12933,5 +12827,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Letališče"
@@ -12939,15 +12833,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr ""
@@ -12956,5 +12850,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Nastanitev"
@@ -12966,5 +12860,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -12973,89 +12867,89 @@
 #. <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:1532
+msgid "Edit Hotel"
+msgstr ""
+
+#. item "Accomodation/Hotel" text "Name"
+#: build/trans_presets.java:1535
+msgid "Stars"
+msgstr ""
+
+#. item "Accomodation/Hotel" combo "Stars"
+#: build/trans_presets.java:1537
+msgid "Motel"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
 #: build/trans_presets.java:1539
-msgid "Edit Hotel"
-msgstr ""
-
-#. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
-msgid "Stars"
-msgstr ""
-
-#. item "Accomodation/Hotel" combo "Stars"
+msgid "Edit Motel"
+msgstr ""
+
+#. item "Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1543
+msgid "Guest House"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1544
-msgid "Motel"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
-msgid "Edit Motel"
-msgstr ""
-
-#. item "Accomodation/Motel" text "Name"
+msgid "Edit Guest House"
+msgstr ""
+
+#. item "Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1548
+msgid "Chalet"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
 #: build/trans_presets.java:1550
-msgid "Guest House"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1551
-msgid "Edit Guest House"
-msgstr ""
-
-#. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
-msgid "Chalet"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
+#: build/trans_presets.java:1554
+msgid "Hostel"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
+#: build/trans_presets.java:1556
+msgid "Edit Hostel"
+msgstr ""
+
+#. item "Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1560
+msgid "Alpine Hut"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1561
-msgid "Hostel"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
-msgid "Edit Hostel"
-msgstr ""
-
-#. item "Accomodation/Hostel" text "Name"
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1566
+msgid "Caravan Site"
+msgstr ""
+
+#. item
 #: build/trans_presets.java:1567
-msgid "Alpine Hut"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1568
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Accomodation/Alpine Hut" text "Elevation"
+msgid "Edit Caravan Site"
+msgstr ""
+
+#. item "Accomodation/Caravan Site" text "Name"
+#: build/trans_presets.java:1571
+msgid "Camping Site"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
 #: build/trans_presets.java:1573
-msgid "Caravan Site"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1574
-msgid "Edit Caravan Site"
-msgstr ""
-
-#. item "Accomodation/Caravan Site" text "Name"
+msgid "Edit Camping Site"
+msgstr ""
+
+#. item "Accomodation/Camping Site" text "Name"
 #: build/trans_presets.java:1578
-msgid "Camping Site"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
-msgid "Edit Camping Site"
-msgstr ""
-
-#. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
 msgid "Food+Drinks"
 msgstr "Hrana in pijača"
@@ -13066,5 +12960,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -13072,5 +12966,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr ""
@@ -13078,5 +12972,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr ""
@@ -13084,82 +12978,82 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr ""
 
+#: build/trans_presets.java:1586
+msgid "Fast Food"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
+#: build/trans_presets.java:1588
+msgid "Edit Fast Food Restaurant"
+msgstr ""
+
 #: build/trans_presets.java:1593
-msgid "Fast Food"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
+msgid "Cafe"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
 #: build/trans_presets.java:1595
-msgid "Edit Fast Food Restaurant"
-msgstr ""
-
-#: build/trans_presets.java:1600
-msgid "Cafe"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
 msgid "Edit Cafe"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Pivnica"
@@ -13167,52 +13061,52 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Uredi pivnico"
 
 #. item "Food+Drinks/Pub" text "Name"
+#: build/trans_presets.java:1605
+msgid "Biergarten"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1606
+msgid "Edit Biergarten"
+msgstr ""
+
+#. item "Food+Drinks/Biergarten" text "Name"
+#: build/trans_presets.java:1610
+msgid "Bar"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
 #: build/trans_presets.java:1612
-msgid "Biergarten"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:1613
-msgid "Edit Biergarten"
-msgstr ""
-
-#. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
-msgid "Bar"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
+#: build/trans_presets.java:1616
+msgid "Nightclub"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
+#: build/trans_presets.java:1618
+msgid "Edit Nightclub"
+msgstr ""
+
+#. item "Food+Drinks/Nightclub" text "Name"
 #: build/trans_presets.java:1623
-msgid "Nightclub"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
-msgid "Edit Nightclub"
-msgstr ""
-
-#. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
 msgid "Tourism"
 msgstr "Turizem"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr ""
@@ -13221,22 +13115,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "Muzej"
@@ -13244,10 +13127,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "Uredi muzej"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -13256,10 +13139,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "Uredi živalski vrt"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -13267,25 +13150,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr "Uredi razgledišče"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "Umetnina"
@@ -13293,5 +13176,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr "Uredi umetnino"
@@ -13299,77 +13182,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
+msgstr ""
+
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1674
+msgid "Map Type"
+msgstr ""
+
+#. item "Tourism/Map" combo "Map Type"
+#: build/trans_presets.java:1674
+msgid "map"
+msgstr ""
+
+#: build/trans_presets.java:1674
+msgid "citymap"
+msgstr ""
+
+#: build/trans_presets.java:1674
+msgid "hikingmap"
+msgstr ""
+
+#: build/trans_presets.java:1674
+msgid "bicyclemap"
+msgstr ""
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
 #: build/trans_presets.java:1677
+msgid "Information Board"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1681
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1681
+msgid "board"
+msgstr ""
+
+#: build/trans_presets.java:1681
+msgid "history"
+msgstr ""
+
+#: build/trans_presets.java:1681
+msgid "nature"
+msgstr ""
+
+#: build/trans_presets.java:1681
+msgid "wildlife"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1684
 msgid "Guidepost (Hiking)"
 msgstr ""
 
-#. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
-msgid "Map Type"
-msgstr ""
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
-msgid "map"
-msgstr ""
-
-#: build/trans_presets.java:1686
-msgid "citymap"
-msgstr ""
-
-#: build/trans_presets.java:1686
-msgid "hikingmap"
-msgstr ""
-
-#: build/trans_presets.java:1686
-msgid "bicyclemap"
-msgstr ""
-
-#. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
-msgid "Closer Description"
-msgstr ""
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
-msgid "Information Board"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
-msgid "Board Type"
-msgstr ""
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
-msgid "board"
-msgstr ""
-
-#: build/trans_presets.java:1693
-msgid "history"
-msgstr ""
-
-#: build/trans_presets.java:1693
-msgid "nature"
-msgstr ""
-
-#: build/trans_presets.java:1693
-msgid "wildlife"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr ""
@@ -13377,25 +13272,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Grad"
@@ -13404,20 +13299,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -13426,20 +13321,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Uredi arheološko najdišče"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr ""
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr ""
@@ -13447,56 +13354,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr ""
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Igrišče"
@@ -13504,15 +13400,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
@@ -13520,15 +13416,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -13542,6 +13438,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -13620,4 +13516,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -13909,28 +13813,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "šport"
@@ -13940,227 +13845,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr ""
@@ -14199,191 +14104,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Kolesarjenje"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Smučanje"
@@ -14391,56 +14296,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
+#: build/trans_presets.java:1924
+msgid "Difficulty"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:1924
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "advanced"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "Difficulty"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
-msgid "novice"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "easy"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "intermedia"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "advance"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "Strelišče"
@@ -14448,178 +14353,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Zgradbe"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Zgradba"
@@ -14627,5 +14532,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -14633,10 +14538,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -14644,10 +14549,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -14655,10 +14560,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -14667,10 +14572,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Zapor"
@@ -14679,10 +14584,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Policijska postaja"
@@ -14692,10 +14597,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -14704,10 +14609,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Pošta"
@@ -14715,5 +14620,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -14721,15 +14626,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Šola"
@@ -14737,10 +14642,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr ""
@@ -14748,10 +14653,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr ""
@@ -14759,5 +14664,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr ""
@@ -14765,5 +14670,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -14772,10 +14677,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Knjižnica"
@@ -14784,10 +14689,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr ""
@@ -14795,10 +14700,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Gledališče"
@@ -14807,10 +14712,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -14820,5 +14725,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -14827,6 +14732,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Vera"
@@ -14835,66 +14740,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr ""
@@ -14903,81 +14808,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Naslovi"
@@ -14986,5 +14891,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Urejanje podatkov o naslovu"
@@ -14992,5 +14897,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr ""
@@ -14998,20 +14903,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
+#: build/trans_presets.java:2167
+msgid "House name"
+msgstr ""
+
+#. item "Buildings/Addresses" text "Street name"
+#: build/trans_presets.java:2169
+msgid "City name"
+msgstr ""
+
+#. item "Buildings/Addresses" text "City name"
 #: build/trans_presets.java:2170
-msgid "House name"
-msgstr ""
-
-#. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
-msgid "City name"
-msgstr ""
-
-#. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr ""
@@ -15019,5 +14924,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -15026,5 +14931,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Uredi interpolacijo naslovov"
@@ -15032,67 +14937,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
+#: build/trans_presets.java:2179
+msgid "Numbering scheme"
+msgstr ""
+
+#. item "Buildings/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:2179
+msgid "odd"
+msgstr ""
+
+#: build/trans_presets.java:2179
+msgid "even"
+msgstr ""
+
+#: build/trans_presets.java:2179
+msgid "all"
+msgstr ""
+
+#: build/trans_presets.java:2179
+msgid "alphabetic"
+msgstr ""
+
 #: build/trans_presets.java:2182
-msgid "Numbering scheme"
-msgstr ""
-
-#. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
-msgid "odd"
-msgstr ""
-
-#: build/trans_presets.java:2182
-msgid "even"
-msgstr ""
-
-#: build/trans_presets.java:2182
-msgid "all"
-msgstr ""
-
-#: build/trans_presets.java:2185
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Stolp"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -15100,10 +15009,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -15111,10 +15020,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -15122,10 +15031,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -15135,10 +15044,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Žerjav"
@@ -15146,10 +15055,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr ""
@@ -15157,10 +15066,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -15168,10 +15077,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -15179,5 +15088,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
@@ -15185,5 +15094,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr ""
@@ -15193,39 +15102,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
+#: build/trans_presets.java:2260
+msgid "wind"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "hydro"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "fossil"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "nuclear"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "coal"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "photovoltaic"
+msgstr ""
+
+#: build/trans_presets.java:2260
+msgid "gas"
+msgstr ""
+
+#. item "Man Made/Power Generator" text "Name"
 #: build/trans_presets.java:2263
-msgid "wind"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "hydro"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "fossil"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "nuclear"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "coal"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "photovoltaic"
-msgstr ""
-
-#: build/trans_presets.java:2263
-msgid "gas"
-msgstr ""
-
-#. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
 msgid "Power Station"
 msgstr ""
@@ -15234,10 +15143,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr ""
@@ -15246,5 +15155,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -15252,10 +15161,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -15266,5 +15175,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
@@ -15272,5 +15181,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr ""
@@ -15279,25 +15188,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
+#: build/trans_presets.java:2294
+msgid "Amount of Wires"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Amount of Wires"
 #: build/trans_presets.java:2297
-msgid "Amount of Wires"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Stranišča"
@@ -15305,25 +15214,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr ""
 
-#. item "Amenities/Toilets" text "Reference number"
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
+msgid "Note"
+msgstr ""
+
+#. item "Amenities/Toilets" text "Note"
 #: build/trans_presets.java:2307
-msgid "Charge"
-msgstr ""
-
-#. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
-msgid "Note"
-msgstr ""
-
-#. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telefon"
@@ -15332,5 +15236,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -15338,5 +15242,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Kovanci"
@@ -15344,5 +15248,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Bankovci"
@@ -15350,5 +15254,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -15356,5 +15260,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -15362,15 +15266,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -15379,5 +15283,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -15385,35 +15289,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2330
+msgid "Batteries"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2331
+msgid "Cans"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2332
+msgid "Clothes"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Clothes"
 #: build/trans_presets.java:2333
-msgid "Batteries"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Batteries"
+msgid "Glass"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Glass"
 #: build/trans_presets.java:2334
-msgid "Cans"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Cans"
+msgid "Paper"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Paper"
 #: build/trans_presets.java:2335
-msgid "Clothes"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
-msgid "Glass"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Glass"
+msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
 #: build/trans_presets.java:2337
-msgid "Paper"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
-msgid "Scrap Metal"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
 msgid "Bench"
 msgstr "Klopca"
@@ -15422,20 +15326,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
+#: build/trans_presets.java:2342
+msgid "Edit Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand" check "Shelter"
 #: build/trans_presets.java:2345
-msgid "Edit Hunting Stand"
-msgstr ""
-
-#. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr ""
@@ -15443,22 +15347,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr ""
@@ -15467,10 +15371,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -15479,10 +15383,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr ""
@@ -15490,25 +15394,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr ""
@@ -15516,10 +15420,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr ""
@@ -15527,10 +15431,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -15538,5 +15442,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -15544,88 +15448,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Mesar"
@@ -15633,10 +15537,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Uredi mesarja"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Pekarna"
@@ -15644,10 +15548,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Uredi pekarno"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr ""
@@ -15655,70 +15559,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Šola"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Uredi šolo"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
-msgstr ""
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
+msgstr "Uredu avtobusno postajališče"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr ""
@@ -15726,10 +15644,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -15737,10 +15655,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -15748,60 +15666,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "Uredi sam svoj mojster trgovino"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Čistilnica"
@@ -15809,10 +15727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Uredi čistilnico"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Pralnica"
@@ -15820,10 +15738,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Uredi pralnico"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr ""
@@ -15831,35 +15749,36 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Šport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr ""
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2522
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+msgid "Optician"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr ""
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Banka"
@@ -15867,5 +15786,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Uredi banko"
@@ -15873,10 +15792,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -15884,5 +15803,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -15890,15 +15809,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr ""
@@ -15906,20 +15825,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -15927,5 +15846,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -15933,10 +15852,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -15944,10 +15863,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr ""
@@ -15956,5 +15875,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -15963,20 +15882,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -15984,5 +15903,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr ""
@@ -15991,25 +15910,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr ""
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Država"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Uredi državo"
@@ -16017,45 +15936,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr ""
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr ""
@@ -16063,10 +15983,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr ""
@@ -16074,30 +15994,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Vas"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr ""
@@ -16105,10 +16026,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Otok"
@@ -16116,5 +16037,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Uredi otok"
@@ -16122,5 +16043,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr ""
@@ -16128,10 +16049,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Vrh"
@@ -16139,10 +16060,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Uredi vrh"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr ""
@@ -16150,10 +16071,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr ""
@@ -16161,70 +16082,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Drevo"
@@ -16233,15 +16154,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr ""
@@ -16250,5 +16171,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr ""
@@ -16256,17 +16177,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Gozd"
@@ -16275,19 +16196,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Uredi gozdnata tla"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr ""
@@ -16296,70 +16261,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr ""
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr ""
@@ -16367,10 +16333,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr ""
@@ -16378,20 +16344,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr ""
@@ -16399,5 +16365,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -16405,15 +16371,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -16421,9 +16387,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr ""
@@ -16431,39 +16397,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -16471,114 +16437,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr ""
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
-msgid "Brownfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2886
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
-msgid "Greenfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2892
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2921
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2922
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2927
+msgid "Brownfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2928
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:2933
+msgid "Greenfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2934
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr ""
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr ""
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr ""
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr ""
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr ""
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr ""
@@ -16588,5 +16511,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr ""
@@ -16595,10 +16518,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr ""
@@ -16606,5 +16529,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr ""
@@ -16613,5 +16536,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -16619,34 +16542,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr ""
@@ -16655,15 +16578,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr ""
@@ -16671,5 +16594,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16678,5 +16601,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16684,5 +16607,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -16754,24 +16677,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -16816,4 +16739,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16823,19 +16749,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -16849,10 +16776,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -16860,26 +16787,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr ""
@@ -16888,30 +16815,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17095,4 +17022,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17104,4 +17138,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17203,11 +17246,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr ""
@@ -17249,7 +17294,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr ""
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Ovire"
 
 #. color tertiary
@@ -17285,6 +17545,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr ""
@@ -17340,7 +17600,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr ""
@@ -17387,108 +17647,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr ""
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr ""
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17505,4 +17678,9 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+msgid "services"
+msgstr ""
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17512,4 +17690,9 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+msgid "ford"
+msgstr ""
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17526,6 +17709,19 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
 msgstr ""
 
@@ -17539,5 +17735,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr ""
@@ -17551,5 +17747,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr ""
@@ -17563,5 +17759,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr ""
@@ -17589,5 +17785,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr ""
@@ -17602,4 +17798,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17639,5 +17836,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17754,12 +17951,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr ""
@@ -17805,5 +18003,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17821,7 +18019,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr ""
@@ -17844,10 +18042,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -17877,6 +18075,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -17921,6 +18119,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -17934,5 +18132,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr ""
@@ -17954,5 +18152,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -17966,5 +18164,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -17987,4 +18185,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18004,4 +18210,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr ""
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18010,23 +18222,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr ""
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr ""
@@ -18040,5 +18239,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr ""
@@ -18052,5 +18252,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr ""
@@ -18063,6 +18264,20 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+msgid "piste_expert"
+msgstr ""
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18076,5 +18291,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr ""
@@ -18105,4 +18321,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18137,4 +18361,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18147,8 +18395,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr ""
@@ -18161,5 +18411,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr ""
@@ -18173,5 +18426,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr ""
@@ -18299,12 +18552,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr ""
@@ -18318,5 +18571,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr ""
@@ -18388,8 +18641,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr ""
@@ -18425,4 +18678,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18482,11 +18743,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr ""
@@ -18625,6 +18886,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18851,22 +19133,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -18898,6 +19180,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -18933,4 +19215,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -18950,7 +19240,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr ""
@@ -19044,4 +19335,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19244,4 +19543,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19275,28 +19590,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr ""
@@ -19350,4 +19667,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19360,8 +19685,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr ""
@@ -19416,4 +19741,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19510,9 +19836,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr ""
@@ -19584,8 +19910,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr ""
@@ -19655,9 +19981,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr ""
@@ -19671,5 +19997,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr ""
@@ -19683,5 +20009,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr ""
@@ -19703,5 +20029,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr ""
@@ -19715,5 +20041,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr ""
@@ -19727,5 +20053,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -19748,5 +20074,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr ""
@@ -19760,5 +20086,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr ""
@@ -19772,5 +20098,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -19784,5 +20110,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -19796,5 +20122,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -19851,7 +20177,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr ""
@@ -19865,5 +20191,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr ""
@@ -19876,5 +20202,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr ""
@@ -19889,5 +20215,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr ""
@@ -19901,5 +20227,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr ""
@@ -19914,4 +20240,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19953,7 +20280,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr ""
@@ -19967,5 +20295,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr ""
@@ -19979,5 +20307,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr ""
@@ -19991,5 +20319,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr ""
@@ -20003,5 +20331,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr ""
@@ -20015,5 +20343,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr ""
@@ -20091,8 +20419,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr ""
@@ -20140,7 +20468,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr ""
@@ -20282,10 +20610,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr ""
@@ -20326,6 +20654,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr ""
@@ -20607,31 +20942,15 @@
 msgstr ""
 
-#~ msgid "Set start/end for routing. Middle mouse button to reset."
-#~ msgstr "Nastavite začetek/konec poti. Srednji gumb za ponastavitev."
-
-#~ msgid "Please select a color."
-#~ msgstr "Prosim Izberite barvo."
-
-#~ msgid "News about JOSM"
-#~ msgstr "Novice o JOSM"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Pošlji to sled..."
-
-#~ msgid "Add Site"
-#~ msgstr "Dodaj vir"
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Dodaj nov vir (strežnik) vstavkov."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr "Preveri za nove vstavke in posodobitve na izbranih strežnikih."
-
-#~ msgid "Version"
-#~ msgstr "Različica"
-
-#~ msgid "Update Site URL"
-#~ msgstr "URL naslov strežnika posodobitev"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Neveljaven URL"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Odpri ..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Opis"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Prenos prekinjen zaradi napake (5 sekund premora):"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Uredi dók"
Index: /applications/editors/josm/i18n/po/sv.po
===================================================================
--- /applications/editors/josm/i18n/po/sv.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/sv.po	(revision 14844)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-27 13:33+0000\n"
-"Last-Translator: Konrad Skeri <konrad@skeri.com>\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-04-03 16:16+0000\n"
+"Last-Translator: Susanna Björverud <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:53+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Skapar huvudgränssnittet"
@@ -36,39 +36,39 @@
 msgstr "Projektion kunde ej läsas från inställningarna. Använde rEPSG:4326"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr ""
 "Tips: Några av ändringarna härrör från inskickning av nya data till servern."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Osparade ändringar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Det finns osparade ändringar. Åsidosätt ändringarna och fortsätt?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr "Spara och avsluta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr "Kassera och avsluta"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -79,10 +79,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -93,4 +93,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -100,10 +101,10 @@
 msgstr "Avbryt"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Hoppar över felaktig URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -129,8 +130,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -271,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -406,6 +407,6 @@
 msgstr "Byt riktning och slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -413,20 +414,20 @@
 msgstr "Ange värden för alla konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr "Jämka konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Slå ihop {0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Alla sträckor var tomma"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -530,5 +531,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -649,6 +650,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -657,6 +658,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -784,5 +785,5 @@
 msgstr "Slå ihop i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -790,5 +791,5 @@
 "behöva tas bort."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1066,5 +1067,5 @@
 msgstr "Spara nuvarande data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1074,27 +1075,27 @@
 "in detta som ett fel."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr ""
 "Det finns inte något öppet dokument, så det finns inte något att spara."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Tomt dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr "Dokumentet innehåller inte någon data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr "Spara i alla fall"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1104,32 +1105,32 @@
 "som om du avvisat dem alla. Fortsätt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr "Avvisa konflikter och spara"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "Spara GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "Spara OSM-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Kunde inte backa upp filen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Okänd filändelse."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Det uppstod ett fel när filen skulle sparas."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Det uppstod ett fel när backup-filen skulle återställas."
@@ -1186,18 +1187,18 @@
 msgstr "Stäng"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Dela sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Dela sträckan vid vald nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Det går inte att dela baserat på nuvarande urval."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1205,5 +1206,5 @@
 msgstr[1] "De valda noderna ligger inte inuti någon sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1219,9 +1220,9 @@
 "sträckan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "De valda noderna ingår inte i samma sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1229,10 +1230,10 @@
 msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Du måste välja två eller fler noder för att dela en sluten sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1242,5 +1243,5 @@
 "sträckan.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1250,5 +1251,5 @@
 "Du bör kontrollera detta och rätta till eventuella fel."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1407,46 +1408,50 @@
 "Denna handling kräver {0} enskilda hämtningsförfrågningar. Vill du fortsätta?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "Skicka in till OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Skicka in alla ändringar till OSM-servern."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Nya objekt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Ändrade objekt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Borttagna objekt:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Ge en kort kommentar till de ändringar som du skickar in:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Skicka in dessa ändringar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr "Skicka in ändringar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Det finns inte någonting att skicka in. Skaffa lite data först."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Det finns olösta konflikter. Du måste lösa dessa först."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Det finns inte några ändringar att skicka in."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Skickar data"
@@ -1631,31 +1636,33 @@
 msgstr "Det går inte att lägga till en nod utanför världen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Lägg till nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Lägg till en nod till sträckan"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Knyt en existerande nod till en sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Lägg till en ny nod i en befintlig sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Lägg till en nod i en sträcka och bind ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr "Skapa ny nod"
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr "Markera nod under pekare."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1664,9 +1671,4 @@
 msgstr[0] "Infoga ny nod i väg."
 msgstr[1] "Infoga ny nod i {0} vägar."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr "Markera nod under pekare."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -1753,4 +1755,6 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
+"Flytta objekt genom att dra; Använd Skift för att lägga till (Ctrl för att "
+"växla läge); Skift+Ctrl för att rotera"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
@@ -2093,5 +2097,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2286,5 +2290,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "järnväg"
@@ -2306,127 +2310,127 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "En sträcka för en yta är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygonsträckan ''{0}'' är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "Tom medlem i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Tog bort medlemmen ''{0}'' i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Sträcka \"{0} med mindre än två punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr "Det finns mer än en \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr "Det finns mer än en \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr "Mer än en \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Okänd roll ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Okänd medlemstyp för ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr "Det finns inte någon \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr "Det finns inte någon \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr "Ingen nod eller sträcka för \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stil för restriktion {0} kunde inte hittas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Icke-sträcka ''{0}'' i multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygonen ''{0}'' saknar yttre sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Den inre sträckan ''{0}'' befinner sig utanför."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil för yttre väg ''{0}'' passar inte."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "otaggade"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "text"
@@ -2434,5 +2438,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2460,5 +2464,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "bakgrund"
@@ -2525,5 +2529,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2537,5 +2541,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2565,14 +2569,14 @@
 msgstr "jämkad version:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Dagens meddelande är inte tillgängligt"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr "- nuvarande version är {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr "Hämtar \"Dagens meddelande\""
@@ -2637,5 +2641,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid "any"
-msgstr ""
+msgstr "valfri"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -2644,14 +2648,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "Användarnamn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -2659,57 +2663,57 @@
 "Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "användning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "alternativ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Visa denna hjälptext"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Standard unix-geometri-argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Hämta hem området inom gränsvärdena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Öppna fil (som rå gps, om .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Hämta området innanför gränsvärden som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Gör urval med angivet sökkriterium"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr "Öppna i maximerat läge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Återställ inställningarna till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Ange språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "exempel"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2719,23 +2723,28 @@
 "data innan --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Istället för --download=<bbox> kan du använda osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Aktiverar uppdaterade insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Hämtar tidiga insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Anger förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Hämtar insticksmoduler"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2913,5 +2922,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3123,5 +3132,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Roll"
@@ -3169,73 +3178,71 @@
 msgstr "Egenskaper / Roller"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr "Verkställ ändringar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Skapa ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Redigera ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Redigera relation # {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Innehas av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Taggar (tomt värde tar bort taggen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr "Flytta uppåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Flytta vald medlem/valda medlemmar uppåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Lägg till vald"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr "Ta bort det valda"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr "Ta bort alla för närvarande valda objekt från relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr "Flytta nedåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Flytta vald medlem/valda medlemmar nedåt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3244,36 +3251,36 @@
 msgstr "Ta bort"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Hämta medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hämta alla ofullständiga sträckor och noder i relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Medlemmar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr "Relationsredigerare:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "Konflikter upptäcktes under import."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Fel vid inläsning av serverns svar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Kan inte ansluta till server."
@@ -3287,10 +3294,11 @@
 msgstr "Ta bort den valda relationen"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "Relationer"
@@ -3484,5 +3492,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Platser"
@@ -3529,21 +3537,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "typ"
@@ -3597,10 +3605,7 @@
 "Du kan använda musen eller Ctrl+Piltangenter/./ för att zooma och panorera."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Karta"
@@ -3754,4 +3759,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3857,5 +3863,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3907,4 +3913,6 @@
 "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:1024
@@ -3916,19 +3924,34 @@
 "kunna uppskattas med någon rimlighet uteslöts."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "utanför hämtat område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} raderad.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "användning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Version {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3936,21 +3959,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4147,5 +4170,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:38
 msgid "Modified times (time stamps) of audio files."
-msgstr ""
+msgstr "Ändrade tidpunkter (tidsstämplar) från ljudfiler."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
@@ -4388,5 +4411,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4471,4 +4494,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4552,7 +4577,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4565,7 +4587,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4581,10 +4610,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4753,5 +4782,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4785,7 +4816,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4869,4 +4900,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4919,4 +4958,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4925,7 +4970,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4934,15 +4976,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4967,129 +4998,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "Namn"
@@ -5138,12 +5171,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Hämta alla rutor"
+msgstr "Lokala filer"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "Zon"
+msgstr "Inget"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5170,45 +5201,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Bil"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Cykel"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5216,25 +5237,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Fotgängare"
@@ -5284,7 +5310,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "Rita linjer mellan råa gps-punkter."
+msgstr "Rita linjer mellan råa GPS-punkter"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5930,10 +5955,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, Det saknas förmodligen några taggar."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Förbereder data..."
@@ -5943,25 +5968,75 @@
 msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Öppnar ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Stänger ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Det finns inte några ändringar att skicka in."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Förbereder..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Skickar in..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Fel vid inläsning av serverns svar."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Okänd värddator"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Felaktigt lösenord eller användarnamn."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Varning: Lösenordet skickas okrypterat."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 msgid "Save user and password (unencrypted)"
 msgstr "Spara användare och lösenord (okrypterat)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Ange losenord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr "Logga in"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5972,35 +6047,43 @@
 msgstr "Fel vid tolkning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Okänd version"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Okänd version"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "Hittade element av typen <nd> på icke-sträcka"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> har nollreferens"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "Fann <member>-tagg utanför relation."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ofullständig <roll>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Ogiltigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Det nödvändiga attributet \"{0}\" saknas."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
@@ -6008,9 +6091,9 @@
 "Hoppar över en sträcka eftersom den innehåller en nod som inte finns: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr "Förbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Felformaterad nod-id"
@@ -6020,5 +6103,5 @@
 msgstr "Tar kontakt med servern..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -6026,5 +6109,5 @@
 "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -6034,55 +6117,8 @@
 "igen efter en stund."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Ge en kort kommentar till de ändringar som du skickar in:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Bidragskommentar"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), {3} kvar. Skickar in {4}: {5} (id: {6})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Ett fel inträffade: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Öppnar ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Servern har inte stöd för ändringssamlingar"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Okänd värddator"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Förbereder..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Skickar in..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Stänger ändringssamling..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6258,6 +6294,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "okänd"
@@ -6446,7 +6482,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Skapa ytor"
+msgstr "Skapa ett nätverk av sträckor"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6458,5 +6493,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
 msgid "Select two ways with a node in common"
-msgstr ""
+msgstr "Välj två sträckor som delar en nod."
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
@@ -6465,7 +6500,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Skapa ytor"
+msgstr "Skapa ett rutnät av sträckor"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6489,5 +6523,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr "Beskrivning"
@@ -6814,5 +6848,5 @@
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
-msgstr ""
+msgstr "Hittade {0} träffar för {1} i GPX-spår {2}"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640
@@ -6832,8 +6866,9 @@
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr ""
+"Det valda GPX-spåret innehåller inte några tidsstämplar. Välj ett annat spår."
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714
 msgid "GPX Track has no time information"
-msgstr ""
+msgstr "GPX-spåret saknar tidsinformation"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759
@@ -6855,5 +6890,5 @@
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
-msgstr ""
+msgstr "Parade ihop {0} av {1} foton med GPX-spåret"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:782
@@ -6865,5 +6900,5 @@
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
-msgstr ""
+msgstr "Förskjutning mellan spår och foton: {0}m {1}s"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:851
@@ -6879,5 +6914,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
 msgid "Adjust timezone and offset"
-msgstr ""
+msgstr "Justera tidszon och tidsförskjutning"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
@@ -7365,5 +7400,5 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85
 msgid "EditGpx"
-msgstr ""
+msgstr "RedigeraGpx"
 
 #. TODO what is icon at the end?
@@ -7544,5 +7579,5 @@
 #: ../plugins/grid/src/grid/GridPlugin.java:27
 msgid "Add grid"
-msgstr ""
+msgstr "Lägg till rutnät"
 
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
@@ -7749,7 +7784,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "vatten"
@@ -8054,5 +8089,5 @@
 msgstr "Hämtningsloop för OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "Visar problemfall från OpenStreetBugs"
@@ -8071,4 +8106,11 @@
 msgstr "Varning"
 
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Ett fel inträffade: {0}"
+
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
 msgid "Couldn't create new bug. Result: {0}"
@@ -8097,35 +8139,38 @@
 "från OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Lägg till kommentar"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Skriv in din kommentar"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Markera som slutförd"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Är du säker på att du vill stänga?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Nytt problemfall"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Skapa ett problemfall"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "Beskriv problem noggrannt"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Skapa ett problemfall"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8154,5 +8199,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8162,9 +8207,9 @@
 "kartinställningssidan av inställningar."
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "inställningar för osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Firefox-applikationen"
@@ -8235,95 +8280,79 @@
 msgstr "Fjärrstyrning har begärts för att importera data från följande URL:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Navigation"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Ingenting"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
+msgid "Click to add destination."
+msgstr "Klicka för att lägga till ruttnoder."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 #, fuzzy
-msgid "Click to add route nodes."
-msgstr "Klicka för att lägga till en ny nod."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
+msgid "Click and drag to move destination"
+msgstr "Klicka och dra för att flytta ruttnoder."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
 #, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Klicka för att lägga till en ny nod."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
+msgid "Click to remove destination"
+msgstr "Klicka för att lägga till ruttnoder."
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "Öppna en lista över ruttnoder"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
 #, fuzzy
-msgid "Remove route nodes"
-msgstr "Tar bort dubblettnoder..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
-msgid "Open a list of routing nodes"
-msgstr "Öppna en lista över alla relationer"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "Station"
+msgid "Add routing layer"
+msgstr "Lägg till ett nytt lager"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "medelsvår"
+msgstr "Kriterier"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Skor"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr "Närmaste"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Snabbare"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr "Snabbaste"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Ändra riktning på sträckor"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr "Byt riktning på rutten"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "Färjelinje"
+msgstr "Rensa rutten"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "Inställningar för WMS-insticksmodulen"
+msgstr "Inställningar för insticksmodulen för ruttberäkning"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Konfigurera hämtställen för insticksmoduler"
+msgstr "Konfigurera ruttberäkning"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "Avfart"
+msgstr "Typ av väg"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Största tillåtna hastighet (km/h)"
+msgstr "Hastighet (Km/h)"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Höjd"
+msgstr "Vikt"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8331,33 +8360,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Glidande karta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Hämta ruta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Visa status för ruta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Begär omrendering"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Hämta alla rutor"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr "Öka zoomläge"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr "Minska zoomläge"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "bilden har inte hämtats"
@@ -8380,34 +8409,34 @@
 msgstr "Inställningar för insticksprogrammet GlidandeKarta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Källor för rutor"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr "Automatisk zoomning: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Autoload Tiles: "
 msgstr "Automatisk hämtning av rutor: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Max zoom lvl: "
 msgstr "Största tillåtna zoomläge: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr "Tona bakgrund: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "fel vid hämtning av metadata"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "begärd: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "fel vid begäran om uppdatering"
@@ -8422,5 +8451,5 @@
 msgstr "Spara fångade data till en fil varje minut."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8477,7 +8506,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "Redigera delstat"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8492,59 +8520,51 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "inget"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "framhäv"
+msgstr "Färgmarkera"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "flera"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr "<flera>"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Ändra egenskaper för upp till {0} objekt."
-msgstr[1] "Ändra egenskaper för upp till {0} objekt."
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] "Ta bort gamla nycklar för upp till {0} objekt"
+msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Ändra egenskaper för upp till {0} objekt."
-msgstr[1] "Ändra egenskaper för upp till {0} objekt."
+msgstr[0] "Uppdatera egenskaper för upp till {0} objekt"
+msgstr[1] "Uppdatera egenskaper för upp till {0} objekt"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "rutt"
+msgstr "Grupp"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "Bäck"
+msgstr "Objekt"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Sök"
+msgstr "Sök: "
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Arkiv"
+msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Bil"
+msgstr "Rensa"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8577,17 +8597,17 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36
 msgid "Reverse a terrace"
-msgstr ""
+msgstr "Vänd på husrad"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverses house numbers on a terrace."
-msgstr ""
+msgstr "Kastar om husnumrena i en husrad."
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverse a Terrace"
-msgstr ""
+msgstr "Vänd på husrad"
 
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113
 msgid "Reverse Terrace"
-msgstr ""
+msgstr "Vänd husrad"
 
 #: ../plugins/terracer/src/terracer/TerracerAction.java:78
@@ -8631,5 +8651,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Gatunamn"
@@ -8730,24 +8750,21 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "La till nod vid alla korsande sträckor"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
+msgstr "Ta bort sträckor som inte är del av en inre multipolygon"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "relation"
+msgstr "Korrigera relationer"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Förena överlappande ytor"
+msgstr "Slog ihop område som låg ovanpå sig själv"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Förena överlappande ytor"
+msgstr "Slog ihop områden som låg ovanpå varandra"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8760,31 +8777,26 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Jämkar konflikter"
+msgstr "Korrigera taggkonflikter"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Ta bort från relation"
+msgstr "Tog bort element från relation"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Slå ihop områden: Ta bort korta sträckor"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Ej slutna sträckor"
+msgstr "Sluten sträcka"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Ta bort foto från lagret"
+msgstr "Ta bort taggar från inre sträckor"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Motorvägskorsning"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9389,4 +9401,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9468,7 +9486,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "byggnad (building)"
@@ -9482,5 +9500,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "yta (area)"
@@ -9786,4 +9804,9 @@
 msgstr "kunde inte hämta ljud ström från adressen"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9812,7 +9835,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Skapa ytor"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9903,21 +9925,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9926,15 +9955,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9944,15 +9973,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9961,5 +9990,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9968,5 +9997,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9975,5 +10004,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10063,5 +10092,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Referens"
@@ -10116,7 +10145,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Lager"
@@ -10159,5 +10188,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Största tillåtna hastighet (km/h)"
@@ -10205,5 +10234,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "Enkelriktat"
@@ -10259,5 +10288,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -10307,5 +10336,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -10352,5 +10381,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Skärning"
@@ -10397,5 +10426,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "Bank"
@@ -10553,6 +10582,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr "Bredd (meter)"
@@ -10601,5 +10630,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Yta"
@@ -10631,5 +10660,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "belagd"
@@ -10640,5 +10669,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "obelagd"
@@ -10652,5 +10681,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "kullersten"
@@ -10802,5 +10831,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10821,6 +10850,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "ja"
@@ -10964,7 +10993,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "nej"
@@ -10978,73 +11007,63 @@
 msgstr "Tung lastbil"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "Häst"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motorcykel"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "Bil"
@@ -11119,130 +11138,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Typ"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11250,5 +11157,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11256,11 +11163,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11268,5 +11169,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11274,5 +11175,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11280,5 +11181,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11286,6 +11187,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11304,6 +11211,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "motorväg"
@@ -11329,6 +11236,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "stamväg"
@@ -11354,6 +11261,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "primärväg"
@@ -11379,6 +11286,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "sekundärväg"
@@ -11392,5 +11299,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "tertiärväg"
@@ -11408,5 +11315,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "bostadsgata"
@@ -11424,5 +11331,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "tillfartsväg"
@@ -11449,6 +11356,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "under byggnad"
@@ -11489,6 +11396,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11499,5 +11405,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "rondell"
@@ -11841,14 +11747,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Operatör"
@@ -11873,20 +11779,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "obevakad"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr "trafikljus"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "ö"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr "utan markering"
@@ -11894,5 +11800,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr "Korsa ridande"
@@ -11901,5 +11807,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr "Korsa cyklande"
@@ -11909,5 +11815,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -12056,10 +11962,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "Höjd"
@@ -12072,29 +11979,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Stätta"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Redigera en stätta"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "Trafikkon"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "Redigera en trafikkon"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -12103,7 +11999,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -12112,235 +12011,223 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "Tillåten trafik:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr ""
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Färist"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Redigera en färist"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "Bussfålla"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr "Spikhinder"
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr "Redigera spikhinder"
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "Betalstation"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "Redigera betalstation"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Gränskontroll"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Redigera en gränskontroll"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Häck"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Stängsel"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Mur"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Stadsmur"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "Stödmur"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Ingång"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Redigera en ingång"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "Grind"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "Redigera en grind"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "Bom"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "Redigera en bom"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Taggtrådsgrind"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Redigera en taggtrådsgrind"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Fösgrind"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Redigera en fösgrind"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "Manshål"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
 msgstr "Redigera ett manshål"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Taggtrådsgrind"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Redigera en taggtrådsgrind"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "Trafikkon"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "Redigera en trafikkon"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Klaffbro"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Redigera en klaffbro"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "Bussfålla"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Färist"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Redigera en färist"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr "Spikhinder"
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr "Redigera spikhinder"
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Fällgaller"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Redigera ett fällgaller"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "Grind"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "Redigera en grind"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr "Bom"
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr "Redigera en bom"
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Stätta"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Redigera en stätta"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Utfallsport"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Redigera en utfallsport"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Fösgrind"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Redigera en fösgrind"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Häck"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Stängsel"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr ""
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Mur"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Stadsmur"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "Stödmur"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "Betalstation"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "Redigera betalstation"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Gränskontroll"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Redigera en gränskontroll"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Ingång"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Redigera en ingång"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Vatten"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Källa"
@@ -12348,5 +12235,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Redigera en källa"
@@ -12354,5 +12241,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Avlopp"
@@ -12360,10 +12247,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "Redigera en avloppsränna"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "Bäck"
@@ -12371,10 +12258,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "Redigera en bäck"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Kanal"
@@ -12382,10 +12269,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Redigera en kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "Flod"
@@ -12395,5 +12282,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "Redigera en flod"
@@ -12401,15 +12288,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Redigera vatten"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Redigera land"
@@ -12417,15 +12304,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "Hamnbassäng"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "Redigera användning av mark för hamnbassäng"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Resevoar"
@@ -12433,15 +12320,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Redigera användning av mark för resevoar"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Täckt resevoar"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Redigera täckt resevoar"
@@ -12449,5 +12336,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Flodbank"
@@ -12456,10 +12343,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Redigera en flodbank"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "Våtmark"
@@ -12470,56 +12357,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "Redigera våtmark"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "träsk"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "mosse"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "kärr"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "vassbädd"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "saltäng"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "marskland"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "mangroveträsk"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Lera"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Redigera lera"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Strand"
@@ -12527,20 +12414,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Redigera strand"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Bukt"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "Redigera bukt"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Stup"
@@ -12548,10 +12435,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Redigera stup"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Kustlinje"
@@ -12559,5 +12446,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Redigera kustlinje"
@@ -12565,5 +12452,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Färjelinje"
@@ -12571,5 +12458,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "Redigera en färjelinje"
@@ -12578,5 +12465,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Varv"
@@ -12584,10 +12471,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Redigera ett varv"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "Docka"
@@ -12595,5 +12482,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "Redigera en docka"
@@ -12601,5 +12488,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Damm"
@@ -12607,15 +12494,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Redigera en damm"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Vattenpunkter"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Slussport"
@@ -12624,5 +12511,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "Överfallsdamm"
@@ -12630,20 +12517,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "Redigera en överfallsdamm"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "Vattenfall"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "Redigera ett vattenfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "Vändplats"
@@ -12652,15 +12539,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Småbåtshamn"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Redigera en småbåtshamn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Pir"
@@ -12668,10 +12555,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Ändra Pir"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Färjeterminal"
@@ -12679,10 +12566,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Redigera en färjeterminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Slip"
@@ -12692,5 +12579,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Redigera en slip"
@@ -12698,10 +12585,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Järnväg"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Järnväg"
@@ -12709,5 +12596,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Redigera en järnväg"
@@ -12737,8 +12624,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "Valfria typer"
@@ -12752,35 +12639,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "bangård"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "sidospår"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "stickspår"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Smalspår"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Redigera en smalspårig järnväg"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "monorail"
@@ -12788,45 +12675,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "Redigera en monorailbana"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Museijärnväg"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Redigera en museijärnväg"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Tunnelbana"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Redigera en tunnebana"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Spårvagn"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Redigera en spårväg"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Spårbussväg"
@@ -12834,5 +12721,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Redigera en spårbussväg"
@@ -12841,14 +12728,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Järnväg utan trafik"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Redigera en järnväg utan trafik"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Nedlagd järnväg"
@@ -12857,5 +12744,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Plankorsning"
@@ -12864,5 +12751,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "Järnvägsövergång"
@@ -12872,5 +12759,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr "Typ av övergångsställe"
@@ -12878,5 +12765,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Vändskiva"
@@ -12885,10 +12772,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "Linbana"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Stollift"
@@ -12896,10 +12783,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Redigera en stollift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Släplift"
@@ -12907,10 +12794,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Redigera en släplift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Linbana"
@@ -12918,24 +12805,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Redigera linbana"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Redigera golf"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "Station"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "Redigera station"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Bränsle"
@@ -12945,5 +12845,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Redigera bränsle"
@@ -12959,5 +12859,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12967,5 +12867,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Redigera en parkeringsplats"
@@ -12973,40 +12873,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "Kapacitet"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "ytbeläggning"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "flervånings-"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "underjordisk"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Handikappplatser"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Avgift"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Biltvätt"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Redigera en biltvätt"
@@ -13014,5 +12915,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Affär"
@@ -13020,15 +12921,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "Redigera bilförsäljare"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "Bilverkstad"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "Redigera en bilverkstad"
@@ -13036,5 +12937,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "Uthyrning"
@@ -13043,10 +12944,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "Redigera biluthyrning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Bilpool"
@@ -13054,5 +12955,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Redigera bilpool"
@@ -13060,5 +12961,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Redigera en cykelparkering"
@@ -13067,5 +12968,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "Redigera en cykeluthyrning"
@@ -13074,15 +12975,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Redigera cykelaffär"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Kollektivtrafik"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-klassificering"
@@ -13090,5 +12991,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Järnvägshållplats"
@@ -13096,5 +12997,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Redigera hållplats"
@@ -13102,5 +13003,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Spårvagnshållplats"
@@ -13109,5 +13010,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "Redigera spårvagnshållplats"
@@ -13115,5 +13016,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Plattform"
@@ -13122,5 +13023,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Redigera plattform"
@@ -13132,5 +13033,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "Referens (spårnummer)"
@@ -13138,10 +13039,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Tunnelbaneingång"
@@ -13150,10 +13051,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Redigera tunnelbaneingång"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "Rullstol"
@@ -13162,5 +13063,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Bussterminal"
@@ -13169,5 +13070,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "Redigera en bussterminal"
@@ -13175,5 +13076,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "Busshållplats"
@@ -13183,5 +13084,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "Redigera en busshållplats"
@@ -13189,10 +13090,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "Bussplattform"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "Redigera en bussplattform"
@@ -13200,5 +13101,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13206,5 +13107,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "Redigera en taxistation"
@@ -13212,5 +13113,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Flygplats"
@@ -13218,15 +13119,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13235,5 +13136,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Logi"
@@ -13245,5 +13146,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -13252,15 +13153,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Redigera ett hotell"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Stjärnor"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motell"
@@ -13268,20 +13169,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Redigera ett motell"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Pensionat"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Redigera pensionat"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "Fäbod"
@@ -13289,10 +13190,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "Redigera fäbod"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Vandrarhem"
@@ -13300,30 +13201,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Redigera ett vandrarhem"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Alphydda"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Redigera alphydda"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Husvagnscamping"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Redigera en husvagnscamping"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Campingplats"
@@ -13331,10 +13232,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Redigera en campingplats"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Mat+Dryck"
@@ -13345,5 +13246,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurang"
@@ -13351,5 +13252,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Redigera en restaurang"
@@ -13357,5 +13258,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "Kök"
@@ -13363,61 +13264,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italienskt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "kinesiskt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "hamburgare"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "grekiskt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "tyskt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "indiskt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "lokalt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "turkiskt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asiatiskt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "thailändskt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexikanskt"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japanskt"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Snabbmat"
@@ -13425,9 +13326,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Redigera en snabbmatsrestaurang"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Kafé"
@@ -13435,10 +13336,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Redigera kafé"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Pub"
@@ -13446,20 +13347,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Redigera pub"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Redigera Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr ""
@@ -13467,10 +13368,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -13478,20 +13379,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "Redigera nattklubb"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "Sevärdhet"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "Redigera sevärdhet"
@@ -13500,22 +13401,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Öppettider"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "Museum"
@@ -13523,10 +13413,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "Redigera museum"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "Zoo"
@@ -13535,10 +13425,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "Redigera zoo"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "Utsiktsplats"
@@ -13546,25 +13436,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr "Redigera utsiktsplats"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr "Utsiktstorn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr "Nöjespark"
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr "Redigera en nöjespark"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "Konst"
@@ -13572,5 +13462,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr "Redigera konstverk"
@@ -13578,77 +13468,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "karta"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "stadskarta"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "vandringskarta"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "cykelkarta"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr ""
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "historiskt"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "naturfenomen"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr "djurliv"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "VIndskydd"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Redigera vindskydd"
@@ -13656,25 +13558,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Eldstad"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Picknickplats"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Redigera picknickplats"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Historiska platser"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Slott"
@@ -13683,20 +13585,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Redigera slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Redigera ruiner"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Utgrävningsplats"
@@ -13705,20 +13607,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Redigera utgrävningsplats"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Krigsskådeplats"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Redigera krigsskådeplats"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -13726,56 +13640,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Krigsskådeplats"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Redigera krigsskådeplats"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Lekplats"
@@ -13783,15 +13686,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
@@ -13799,15 +13702,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -13821,6 +13724,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "välj sport:"
@@ -13899,4 +13802,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14188,28 +14099,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "sport"
@@ -14219,227 +14131,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "flera"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "bågskytte"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "friidrott"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "australisk fotboll"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "basket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "boule"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "kanot"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "klättring"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "kricket_nät"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "hundracing"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "ridsport"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "amerikansk fotboll"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "hästkapplöpning"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "rackets"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "skytte"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "skridskoåkning"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "skidåkning"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "fotboll"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "simning"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "Plan"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Flera"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
@@ -14478,191 +14390,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "plan"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "sporthall"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Friidrott"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Cykling"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Redigera motorsport"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "Simning"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "Redigera simning"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -14670,56 +14582,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "Difficulty"
 msgstr "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "easy"
 msgstr "lätt"
 
-#: build/trans_presets.java:1927
-msgid "intermedia"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
 msgstr "medelsvår"
 
-#: build/trans_presets.java:1927
-msgid "advance"
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
 msgstr "svår"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1924
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1927
 msgid "Shooting"
 msgstr "Skytte"
@@ -14727,178 +14641,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Redigera skytte"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Amerikansk fotboll"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Redigera amerikansk fotboll"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Basket"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Redigera rugby"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Redigera tennis"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Byggnader"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Byggnad"
@@ -14906,5 +14820,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -14912,10 +14826,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Redigera offentlig byggnad"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "Stadshus"
@@ -14923,10 +14837,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "Redigera stadshus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Ambassad"
@@ -14934,10 +14848,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Redigera ambassad"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "Domstol"
@@ -14946,10 +14860,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "Redigera domstol"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Fängelse"
@@ -14958,10 +14872,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Redigera fängelse"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Polisstation"
@@ -14971,10 +14885,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Redigera polisstation"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -14983,10 +14897,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "Redigera brandstation"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Postkontor"
@@ -14994,5 +14908,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Redigera postkontor"
@@ -15000,15 +14914,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Skola"
@@ -15016,10 +14930,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "Redigera skola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Högskola/universitet"
@@ -15027,10 +14941,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Redigera högskola/universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "Högskola"
@@ -15038,5 +14952,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "Redigera högskola"
@@ -15044,5 +14958,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Biograf"
@@ -15051,10 +14965,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Redigera biograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "Bibliotek"
@@ -15063,10 +14977,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "Redigera bibliotek"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -15074,10 +14988,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "Redigera konstcenter"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Teater"
@@ -15086,10 +15000,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Redigera teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -15099,5 +15013,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Redigera religiös helgedom"
@@ -15106,6 +15020,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Religion"
@@ -15114,66 +15028,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
-msgstr ""
-
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
+msgstr "italienskt"
+
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "Samfund"
@@ -15182,81 +15097,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "luteraner"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "sunnimuslimer"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Adresser"
@@ -15265,5 +15180,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Redigera adressinformation"
@@ -15271,5 +15186,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Husnummer"
@@ -15277,20 +15192,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Husnamn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Stadsnamn"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Landskod"
@@ -15298,5 +15213,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -15305,5 +15220,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Redigera adressinterpolation"
@@ -15311,67 +15226,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Numreringsschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "udda"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "jämn"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "alla"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "friidrott"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Torn"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -15379,10 +15299,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -15390,10 +15310,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Ändra Väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -15401,10 +15321,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Redigera rörledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -15414,10 +15334,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Kran"
@@ -15425,10 +15345,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Ändra Kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Fyrbåk"
@@ -15436,10 +15356,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -15447,10 +15367,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Ändra Mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -15458,5 +15378,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Ändra Övervakning"
@@ -15464,5 +15384,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -15472,39 +15392,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "solkraft"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "naturgas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -15513,10 +15433,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -15525,5 +15445,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Redigera en transformatorstation"
@@ -15531,10 +15451,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Kraftledningsmast"
@@ -15545,5 +15465,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "Redigera en kraftledningsmast"
@@ -15551,5 +15471,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Kraftledning"
@@ -15558,25 +15478,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Spänning"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Antal kablar"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Toaletter"
@@ -15584,25 +15504,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Referensnummer"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Avgift"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telefon"
@@ -15611,5 +15526,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Redigera en telefon"
@@ -15617,5 +15532,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Mynt"
@@ -15623,5 +15538,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Anteckningar"
@@ -15629,5 +15544,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -15635,5 +15550,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -15641,15 +15556,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Återvinning"
@@ -15658,5 +15573,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Redigera en återvinningsstation"
@@ -15664,35 +15579,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Burkar"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Kläder"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Metallskrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "Bänk"
@@ -15701,20 +15616,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Dölj"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Lås"
@@ -15722,22 +15637,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Fontän"
@@ -15746,10 +15661,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -15758,10 +15673,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr ""
@@ -15769,25 +15684,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -15795,10 +15710,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Redigera närköp"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -15806,10 +15721,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Redigera kiosk"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Automat"
@@ -15817,5 +15732,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -15823,88 +15738,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "Slakteri"
@@ -15912,10 +15827,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "Redigera slakteri"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "Bageri"
@@ -15923,10 +15838,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "Redigera bageri"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr "Florist"
@@ -15934,70 +15849,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr "Redigera florist"
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Skola"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Redigera skoaffär"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr "Drycker"
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
 msgstr "Redigera dryckesaffär"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr "Dator"
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr "Redigera datoraffär"
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr "Electronik"
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr "Redigera elektronikaffär"
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr "Redigera hifi-affär"
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr "Möbler"
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr "Redigera möbelaffär"
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr "Trädgårdscenter"
@@ -16005,10 +15934,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr "Redigera trädgårdscenter"
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr "Järnvaror"
@@ -16016,10 +15945,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr "Redigera järnaffär"
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "Gör-det-själv-affär"
@@ -16027,60 +15956,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 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:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr "Kontorsmaterial"
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr "Redigera pappershandel"
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "Hårfrisör"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "Ändra Hårfrisör"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr "Skor"
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr "Redigera skoaffär"
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr "Videobutik"
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr "Redigera videobutik"
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Kemtvätt"
@@ -16088,10 +16017,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Redigera kemtvätt"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Tvätteri"
@@ -16099,10 +16028,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Redigera tvätteri"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Friluftsliv"
@@ -16110,35 +16039,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Redigera affär för friluftsliv"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr "Sportaffär"
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Sport"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr "Redigera sportaffär"
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr "Redigera optiker"
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Bank"
@@ -16146,5 +16077,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Redigera bank"
@@ -16152,10 +16083,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -16163,5 +16094,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -16169,15 +16100,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Läkare"
@@ -16185,20 +16116,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Ändra Tandläkare"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -16206,5 +16137,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -16212,10 +16143,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -16223,10 +16154,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr ""
@@ -16235,5 +16166,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -16242,20 +16173,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationalt format, ex +12-345-67890"
@@ -16263,5 +16194,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -16270,25 +16201,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Ändra Veterinär"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Redigera land"
@@ -16296,45 +16227,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "Delstat"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "Län"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "Redigera län"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Stad"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Småstad"
@@ -16342,10 +16274,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Förort"
@@ -16353,30 +16285,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Plats"
@@ -16384,10 +16317,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Ö"
@@ -16395,5 +16328,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Redigera ö"
@@ -16401,5 +16334,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -16407,10 +16340,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Redigera en grottöppning"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Topp"
@@ -16418,10 +16351,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Redigera topp"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Glaciär"
@@ -16429,10 +16362,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Redigera en glaciär"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Vulkan"
@@ -16440,70 +16373,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Redigera en vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Nationella"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Träd"
@@ -16512,15 +16445,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Naturskog"
@@ -16529,5 +16462,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Redigera naturskog"
@@ -16535,17 +16468,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "barrskog"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "Kulturskog"
@@ -16554,19 +16487,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Bergsluttning (med lösa stenar)"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Redigera bergssluttning (med lösa stenar)"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Buskage"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Redigera buskage"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Höglandshed"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Redigera en höglandshed"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Hed"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Redigera hed"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -16575,70 +16552,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr "Äng"
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Gräs"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "Allmänning"
@@ -16646,10 +16624,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 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:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Allmänning"
@@ -16657,20 +16635,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -16678,5 +16656,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -16684,15 +16662,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 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:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -16700,9 +16678,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -16710,39 +16688,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 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:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -16750,114 +16728,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 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:2914
+msgid "Military"
+msgstr "Militärt område"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Redigera användning av mark för militärt område"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
-msgid "Brownfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2886
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
-msgid "Greenfield"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2892
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:2921
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2922
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2927
+msgid "Brownfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2928
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:2933
+msgid "Greenfield"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2934
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 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:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Militärt område"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Redigera användning av mark för militärt område"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Bergsluttning (med lösa stenar)"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Redigera bergssluttning (med lösa stenar)"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Buskage"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Redigera buskage"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Höglandshed"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Redigera en höglandshed"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Hed"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Redigera hed"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -16867,5 +16802,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -16874,10 +16809,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr "yttre segement"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr "inre segment"
@@ -16885,5 +16820,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr ""
@@ -16892,5 +16827,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -16898,34 +16833,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -16934,15 +16869,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr "till sträcka"
@@ -16950,5 +16885,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16957,5 +16892,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16963,5 +16898,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -17033,24 +16968,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "cykel"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -17095,4 +17030,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17102,19 +17040,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "fot"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -17128,10 +17067,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -17139,26 +17078,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr ""
@@ -17167,30 +17106,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17374,4 +17313,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17383,4 +17429,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17482,11 +17537,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "förlegad"
@@ -17528,7 +17585,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "häst"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Hinder"
 
 #. color tertiary
@@ -17564,6 +17836,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "gata"
@@ -17619,7 +17891,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "landsvägsspår"
@@ -17666,108 +17938,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "räls"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viadukt"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17784,4 +17969,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "tillfartsväg"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17791,4 +17982,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "Vadställe"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17805,8 +18002,21 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "vändplats"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+msgid "emergency_access_point"
+msgstr ""
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17818,5 +18028,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "flodbank"
@@ -17830,5 +18040,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "bäck"
@@ -17842,5 +18052,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "hamn"
@@ -17868,5 +18078,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "akvedukt"
@@ -17881,4 +18091,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17918,5 +18129,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18033,12 +18244,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "byggnadsverk"
@@ -18084,5 +18296,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18100,7 +18312,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr "järnvägspunkt"
@@ -18123,10 +18335,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr ""
@@ -18156,6 +18368,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr ""
@@ -18200,6 +18412,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr ""
@@ -18213,5 +18425,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminal"
@@ -18233,5 +18445,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr ""
@@ -18245,5 +18457,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr ""
@@ -18266,4 +18478,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18283,4 +18503,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "linbana"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18289,23 +18515,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "linbana"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr ""
@@ -18319,5 +18532,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr ""
@@ -18331,5 +18545,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr ""
@@ -18342,6 +18557,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "expert"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr ""
@@ -18355,5 +18585,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr ""
@@ -18384,4 +18615,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18416,4 +18655,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18426,8 +18689,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "kraft"
@@ -18440,5 +18705,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "pir"
@@ -18452,5 +18720,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "rörledning"
@@ -18578,12 +18846,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "fritid"
@@ -18597,5 +18865,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr "marina"
@@ -18667,8 +18935,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "inrättning"
@@ -18704,4 +18972,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18761,11 +19037,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "trafikinrättning"
@@ -18904,6 +19180,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19130,22 +19427,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr ""
@@ -19177,6 +19474,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr ""
@@ -19212,4 +19509,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19229,7 +19534,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "hälsa"
@@ -19323,4 +19629,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19523,4 +19837,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19554,28 +19884,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "affär"
@@ -19629,4 +19961,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19639,8 +19979,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotell"
@@ -19695,4 +20035,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19789,9 +20130,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "turism"
@@ -19863,8 +20204,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "historisk"
@@ -19934,9 +20275,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr ""
@@ -19950,5 +20291,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "stenbrott"
@@ -19962,5 +20303,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr ""
@@ -19982,5 +20323,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "hamnbassäng"
@@ -19994,5 +20335,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "skog"
@@ -20006,5 +20347,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr ""
@@ -20027,5 +20368,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "detaljhandel"
@@ -20039,5 +20380,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "industri"
@@ -20051,5 +20392,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr ""
@@ -20063,5 +20404,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr ""
@@ -20075,5 +20416,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr ""
@@ -20130,7 +20471,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "militär"
@@ -20144,5 +20485,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "begravningsplats"
@@ -20155,5 +20496,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "topp"
@@ -20168,5 +20509,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "glaciär"
@@ -20180,5 +20521,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "vulkan"
@@ -20193,4 +20534,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20232,7 +20574,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "naturfenomen"
@@ -20246,5 +20589,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "buskage"
@@ -20258,5 +20601,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "hed"
@@ -20270,5 +20613,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "skog"
@@ -20282,5 +20625,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "lera"
@@ -20294,5 +20637,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "strand"
@@ -20370,8 +20713,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "rutt"
@@ -20419,7 +20762,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "gräns"
@@ -20561,10 +20904,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "plats"
@@ -20605,6 +20948,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "adress"
@@ -20886,243 +21236,52 @@
 msgstr ""
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Öppna..."
+
+#, fuzzy
+#~ msgid "${plugin.description}"
+#~ msgstr "Beskrivning"
+
+#~ msgid "Commit comment"
+#~ msgstr "Bidragskommentar"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Servern har inte stöd för ändringssamlingar"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):"
+
+#~ msgid "Really mark this issue as ''done''?"
 #~ msgstr ""
-#~ "Om din gps-enhet ritar för få linjer, välj detta för att rita linjer "
-#~ "längs din sträcka."
-
-#~ msgid "Navigate"
-#~ msgstr "Navigera"
-
-#~ msgid "Navigator"
-#~ msgstr "Navigator"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Välj någonting från konfliktlistan."
-
-#~ msgid "Please select a color."
-#~ msgstr "Välj en färg."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Starta inte i helskärmsläge"
-
-#~ msgid "News about JOSM"
-#~ msgstr "Nyheter om JOSM"
-
-#~ msgid "OSM History Information"
-#~ msgstr "OSM-historik"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Klicka för att skapa en ny sträcka till den befintliga noden."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Klicka för att binda ihop med den befintliga noden."
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Klicka för att lägga till en nod och skapa en ny sträcka."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Klicka för att lägga till en ny nod och skapa en förbindelse."
-
-#~ msgid "Please select objects for which you want to change properties."
-#~ msgstr "Välj de objekt vars egenskaper du vill ändra."
-
-#~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
-#~ msgstr ""
-#~ "Detta är den grundläggande relationsredigeraren som låter dig ändra "
-#~ "taggar för en relation och dess medlemmar. Därutöver skulle det behövas "
-#~ "en smart redigerare som läser av typ av relation och gör förnuftiga "
-#~ "begränsningar av dina valmöjligheter."
-
-#~ msgid "Highlight the member from the current table row as JOSM's selection"
-#~ msgstr ""
-#~ "Markera medlemmen från den nuvarande tabellraden som JOSM:s valda objekt"
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Skicka in detta spår..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Denna funktion har nyligen lagts till. Använd med "
-#~ "försiktighet<br>och kontrollera om det fungerar som tänkt.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "Skicka in spår filtrerat av JOSM"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Skicka in rå fil: "
-
-#~ msgid "Description:"
-#~ msgstr "Beskrivning:"
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Taggar (nyckelord i GPX):"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "Skicka in GPX"
-
-#~ msgid "time"
-#~ msgstr "tid"
-
-#~ msgid "desc"
-#~ msgstr "beskr"
-
-#~ msgid "symbol"
-#~ msgstr "symbol"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Skicka in rå fil: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Taggar:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "Välj färgnyans för spåret baserat på hastigheten vid den punkten."
-
-#~ msgid "Unknown type"
-#~ msgstr "Okänd typ"
-
-#~ msgid "NullPointerException, Possibly some missing tags."
-#~ msgstr "NullPointerException, Det saknas förmodligen några taggar."
-
-#~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
-#~ msgstr "Skicka in {0} {1} (id: {2}) {3}% {4}/{5} ({6} kvar)..."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "Redigera en avfart"
-
-#~ msgid "Exit Number"
-#~ msgstr "Avfartsnummer"
-
-#~ msgid "Waterway"
-#~ msgstr "Vattendrag"
-
-#~ msgid "Information point"
-#~ msgstr "Informationspunkt"
-
-#~ msgid "Provider"
-#~ msgstr "Leverantör"
-
-#~ msgid "political"
-#~ msgstr "politiska"
-
-#~ msgid "National_park"
-#~ msgstr "Nationalpark"
-
-#~ msgid "Natural"
-#~ msgstr "Naturfenomen"
-
-#~ msgid "Add Site"
-#~ msgstr "Lägg till webbplats"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Ta bort webbplats(er)"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Välj den webbplats du vill ta bort"
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Kontrollplats(er)"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr ""
-#~ "Välj vilken plats/vilka platser som skall genomsökas efter uppdateringar."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Lägg till en ny webbplats för insticksmoduler"
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Ta bort vald plats/valda platser från listan."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr ""
-#~ "Genomsök vald plats/valda platser efter nya insticksmoduler eller "
-#~ "uppdateringar"
-
-#~ msgid "Update Sites"
-#~ msgstr "Uppdatera platser"
-
-#~ msgid "Version"
-#~ msgstr "Version"
-
-#~ msgid "Install"
-#~ msgstr "Installera"
-
-#~ msgid "Version: {0}<br>Last change at {1}"
-#~ msgstr "Version: {0}<br>Senast ändrad {1}"
-
-#~ msgid "SurveyorPlugin depends on LiveGpsPlugin!"
-#~ msgstr "SurveyorPlugin behöver LiveGpsPlugin!"
-
-#~ msgid "LiveGpsPlugin not found, please install and activate."
-#~ msgstr "LiveGpsPlugin kunde inte hittas, installera och aktivera."
-
-#~ msgid "SurveyorPlugin is disabled for the moment"
-#~ msgstr "SurveyorPlugin är för tillfället avaktiverad"
-
-#~ msgid "SurveyorPlugin"
-#~ msgstr "SurveyorPlugin"
-
-#~ msgid "Version {0} - Last change at {1}"
-#~ msgstr "Version {0} - Senaste ändring {1}"
-
-#~ msgid "Open waypoints file"
-#~ msgstr "Öppna en sträckpunktsfil"
-
-#~ msgid "Open a waypoints file."
-#~ msgstr "Öppna en sträckpunktsfil."
-
-#~ msgid "Data error: lat value \"{0}\" is out of bounds."
-#~ msgstr "Datafel: latitudvärdet \"{0}\" ligger utanför gränsvärdena."
-
-#~ msgid "Data error: lon value \"{0}\" is out of bounds."
-#~ msgstr "Datafel: longitudvärdet \"{0}\" ligger utanför gränsvärdena."
-
-#~ msgid "Add Node"
-#~ msgstr "Lägg till nod"
-
-#~ msgid "Signpost"
-#~ msgstr "Skylt"
-
-#~ msgid "office"
-#~ msgstr "kontor"
-
-#~ msgid "guidepost"
-#~ msgstr "vägvisare"
-
-#~ msgid "NoName"
-#~ msgstr "UtanNamn"
-
-#~ msgid "Ref"
-#~ msgstr "Ref"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Uppdatera URL för webbplats"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Ogiltig URL"
-
-#~ msgid "unusual named way type"
-#~ msgstr "sträcktyp som vanligtvis ej är namnad"
-
-#~ msgid "Download \"Message of the day\""
-#~ msgstr "Hämtar \"Dagens meddelande\""
-
-#~ msgid "Open map features in browser"
-#~ msgstr "Öppna kartdrag i webbläsare"
-
-#~ msgid "The \"{0}\" way must contain at least 2 nodes."
-#~ msgstr "Det måste finnas åtminstone \"{0}\"-sträckor."
-
-#~ msgid "Upload GPX track"
-#~ msgstr "Skicka in GPX-spår"
-
-#~ msgid "How many buildings are in the terrace?"
-#~ msgstr "Hur många enskilda hus i husraden?"
+#~ "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "Remove route nodes"
+#~ msgstr "Ta bort ruttnoder"
+
+#~ msgid "Start routing"
+#~ msgstr "Påbörja ruttberäkning"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Klaffbro"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Redigera en klaffbro"
+
+#~ msgid "Portcullis"
+#~ msgstr "Fällgaller"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Redigera ett fällgaller"
+
+#~ msgid "Charge"
+#~ msgstr "Avgift"
+
+#~ msgid "sports"
+#~ msgstr "Sportaffär"
+
+#~ msgid "viaduct"
+#~ msgstr "viadukt"
Index: /applications/editors/josm/i18n/po/tr.po
===================================================================
--- /applications/editors/josm/i18n/po/tr.po	(revision 14843)
+++ /applications/editors/josm/i18n/po/tr.po	(revision 14844)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-31 16:58+0200\n"
-"PO-Revision-Date: 2009-03-24 16:48+0000\n"
+"POT-Creation-Date: 2009-04-30 15:23+0200\n"
+"PO-Revision-Date: 2009-03-31 16:20+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Türkçe\n"
@@ -18,9 +18,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-03-31 14:52+0000\n"
+"X-Launchpad-Export-Date: 2009-04-30 11:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Creating main GUI"
 msgstr "Arayüz Oluşturuluyor."
@@ -38,38 +38,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:345
+#: ../core/src/org/openstreetmap/josm/Main.java:346
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:346
+#: ../core/src/org/openstreetmap/josm/Main.java:347
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
 msgid "Unsaved Changes"
 msgstr "Saklanılmayan Çalışmalar"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:347
+#: ../core/src/org/openstreetmap/josm/Main.java:348
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Bazı çalışmalar saklanılmadı. Değişikliklerden vazgeç ve Devam Et?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Save and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 msgid "Discard and Exit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:348
+#: ../core/src/org/openstreetmap/josm/Main.java:349
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
@@ -80,10 +80,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
@@ -94,4 +94,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:320
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
@@ -101,10 +102,10 @@
 msgstr "İptal"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:374
+#: ../core/src/org/openstreetmap/josm/Main.java:375
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Yanlış linkler atlanıldı: URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:387
+#: ../core/src/org/openstreetmap/josm/Main.java:388
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
@@ -130,8 +131,8 @@
 #. Add the name of this application
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:130
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:73
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:113
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:74
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
@@ -272,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -408,6 +409,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:196
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
@@ -415,20 +416,20 @@
 msgstr "Bütün çelişkilere değer ver."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
 msgid "Solve Conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} yolu birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
 msgid "All the ways were empty"
 msgstr "Bütün yollar boştu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:285
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -528,5 +529,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 #, java-format
 msgid "File: {0}"
@@ -647,6 +648,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:502
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
@@ -655,6 +656,6 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:115
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
@@ -777,9 +778,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
 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:277
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
 #, java-format
 msgid "Merge {0} nodes"
@@ -1055,5 +1056,5 @@
 msgstr "Şimdiki bilgiyi kaydet."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:74
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1063,26 +1064,26 @@
 "bildiriniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:77
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:78
 msgid "No document open so nothing to save."
 msgstr "Döküman açık değil Kayıt yapılamaz."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Empty document"
 msgstr "Boş döküman"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "The document contains no data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:82
 msgid "Save anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 msgid "Conflicts"
 msgstr "Çelişkiler"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:90
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1090,32 +1091,32 @@
 msgstr "Çözülmemiş çelişkiler var. Çelişkiler kaydedilmeyecektir! Devam?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
 msgid "Reject Conflicts and Save"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save GPX file"
 msgstr "GPX olarak sakla"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Save OSM file"
 msgstr "OSM dosyası olarak sakla"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Could not back up file."
 msgstr "Yedek dosyası oluşturulamadı."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:165
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:172
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:214
 msgid "Unknown file extension."
 msgstr "Bilinmeyen dosya uzantısı."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:171
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:178
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:219
 msgid "An error occurred while saving."
 msgstr "Kaydetme sırasında bir hata oluştu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:181
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:229
 msgid "An error occurred while restoring backup file."
 msgstr "Yedek dosyası içeri alınırken hata oluştu."
@@ -1171,23 +1172,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Yolları Böl"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split a way at the selected node."
 msgstr "Seçili kavşakta yolu böl."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
 msgid "The current selection cannot be used for splitting."
 msgstr "Yapılan seçim bölme için kullanılamaz."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
 msgstr[0] "Seçili kavşak herhangi bir yolun ortasında değil."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1199,19 +1200,19 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid "The selected nodes do not share the same way."
 msgstr "seçili kavşaklar aynı yolu paylaşmıyorlar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
 msgstr[0] "Seçili yol seçili kavşakları içermiyor."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Dairesel bir yolu bölmek için iki veya fazla kavşak seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1220,5 +1221,5 @@
 "Yol seçili kavşaktan bölünemez. (İpucu: Yolun ortasından kavşak seçiniz)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:290
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -1228,5 +1229,5 @@
 "Gerek duyulursa kontrol edilmeli"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:294
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:295
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1378,46 +1379,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:72
 msgid "Upload to OSM..."
 msgstr "OSM ye yükle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:71
 msgid "Upload all changes to the OSM server."
 msgstr "Bütün değişiklikleri OSM server'ına yükle."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Objects to add:"
 msgstr "Eklenilecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
 msgid "Objects to modify:"
 msgstr "Düzenlenecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 msgid "Objects to delete:"
 msgstr "Silinecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
 msgid "Upload these changes?"
 msgstr "Değişiklikleri yükle?"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
 msgid "Nothing to upload. Get some data first."
 msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Çözülmemiş çelişkiler var. İlk olarak çözümleyiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 msgid "No changes to upload."
 msgstr "Yüklenilecek değişiklik yok."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:178
 msgid "Uploading data"
 msgstr "Bilgi yükleniyor"
@@ -1602,31 +1607,33 @@
 msgstr "Dünya dışına bir kavşak ekleyemezsiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:490
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
 msgid "Add node"
 msgstr "Kavşak Ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:492
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
 msgid "Add node into way"
 msgstr "Yola kavşak ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:497
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
 msgid "Connect existing way to node"
 msgstr "Varolan yolu kavşağa ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:499
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
 msgid "Add a new node to an existing way"
 msgstr "Varolan yola kavaşka ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:506
 msgid "Add node into way and connect"
 msgstr "Yola kavşak ekle ve birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:880
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:885
 msgid "Create new node."
 msgstr ""
 
-#. We already know oldHighlights is not empty, but shift is pressed.
-#. We can assume the new node will be joined into an existing way
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:884
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
+msgid "Select node under cursor."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:892
 #, java-format
@@ -1635,9 +1642,4 @@
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:890
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:912
-msgid "Select node under cursor."
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:901
@@ -2054,5 +2056,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "node"
@@ -2244,5 +2246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:120
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "railway"
 msgstr "demiryolu"
@@ -2263,127 +2265,127 @@
 msgstr[0] "{0} Kavşak"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:235
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:233
 msgid "Area style way is not closed."
 msgstr "Alan stili yol kapalı değil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:429
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:441
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipoligon yolu ''{0}'' kapalı değil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:530
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:777
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:542
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 msgid "Empty member in relation."
 msgstr "İlişkide boş üye."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:532
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:779
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:791
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "''{0}'' üyesini ilişkiden sil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:545
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:790
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:802
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Yol ''{0}'' iki noktadan az içeriyor."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:550
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:556
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:562
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:575
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:567
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:580
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:609
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:743
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:755
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:799
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:811
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Kullanışlı rol yok ''{0}''  ''{1}'' yolu için."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:810
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:822
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Yol-Değil ''{0}'' multipolygon içinde."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:859
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipoligon için dış yol yok ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:951
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:962
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "iç yol ''{0}'' dışarıda."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:999
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1011
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "İç yol stili ''{0}'' multipolygon ."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1024
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Dış yol stili ''{0}'' bulunamadı."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1219
 msgid "untagged"
 msgstr "etiketsiz"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1208
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1220
 msgid "text"
 msgstr "metin"
@@ -2391,5 +2393,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:476
 msgid "way"
@@ -2416,5 +2418,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:138
 msgid "background"
 msgstr "arkaplan"
@@ -2476,5 +2478,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -2488,5 +2490,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:174
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -2515,14 +2517,14 @@
 msgstr "çözülen versiyon:"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
 msgid "Message of the day not available"
 msgstr "Günün Mesajı mevcut değil"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:80
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:81
 #, java-format
 msgid "- running version is {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:115
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:118
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -2595,71 +2597,71 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
 msgid "Username"
 msgstr "KullanıcıAdı"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:84
 msgid "Password"
 msgstr "şifre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "usage"
 msgstr "kullanım"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
 msgid "options"
 msgstr "seçenekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Show this help"
 msgstr "Bu Yardımı Göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Standard unix geometry argument"
 msgstr "Standart unix geometry argümanı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "Download the bounding box"
 msgstr "Kutu ile belirlenen sınırları indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Linkteki bilgiyi indir (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Dosya Aç (ham gps, eğer .gpx ise)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box as raw gps"
 msgstr "Kutu ile belirlenen alanı ham gps olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Select with the given search"
 msgstr "Yapılan aramaya göre seçim yap"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Reset the preferences to default"
 msgstr "Tercihleri varsayılan değerlere getir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Set the language."
 msgstr "Dil seçimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "examples"
 msgstr "örnekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -2669,23 +2671,28 @@
 "bir harita yükleyiniz --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "--download=<bbox> indirmek yerine osm://<bbox> kullanabilirsin\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
 msgid "Activating updated plugins"
 msgstr "Güncellenen eklentiler aktif olacak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Loading early plugins"
 msgstr "Eski eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Setting defaults"
 msgstr "Varsayılan ayarlar alınıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
 msgid "Loading plugins"
 msgstr "Eklentiler yükleniyor"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:144
@@ -2863,5 +2870,5 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 #, java-format
@@ -3068,5 +3075,5 @@
 #. setting up the member table
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Role"
 msgstr "Rol"
@@ -3114,73 +3121,71 @@
 msgstr "Özellik / Üyelik"
 
-#. =================== FIXME FIXME FIXME =====================
-#. ... until here, and also get rid of the "Collections.sort..." below.
 #. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:103
 msgid "Apply Changes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:131
 msgid "Create new relation"
 msgstr "Yeni ilişki oluştur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:133
 msgid "Edit new relation"
 msgstr "Yeni ilişkiyi düzenle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:134
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "İlişki Düzenle #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:153
 msgid "Basic"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:197
 msgid "Occupied By"
 msgstr "Meşgul Eden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234
 msgid "Tags (empty value deletes tag)"
 msgstr "Etiket (Boş değerler etiketi siler)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:236
 msgid "Members"
 msgstr "Üyeler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:273
 msgid "Move the currently selected members up"
 msgstr "Seçili üyeyi yukarı taşı"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:279
 msgid "Add Selected"
 msgstr "Seçileni Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:280
 msgid "Add all currently selected objects as members"
 msgstr "Seçili bütün objeleri üye olarak ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:286
 msgid "Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:287
 msgid "Remove all currently selected objects from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:293
 msgid "Move the currently selected members down"
 msgstr "Seçili üyeyi aşağı taşı"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
@@ -3189,36 +3194,36 @@
 msgstr "Çıkart"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:300
 msgid "Remove the member in the current table row from this relation"
 msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Download Members"
 msgstr "Üyeleri İndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
 #, java-format
 msgid "Members: {0}"
 msgstr "Üyeler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:379
 #, java-format
 msgid "Relation Editor: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:489
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 msgid "There were conflicts during import."
 msgstr "İçeri taşıma esnasında karşıklık oluştu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:497
 msgid "Error parsing server response."
 msgstr "Serverın cevabı tanımlanamdı."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:501
 msgid "Cannot connect to server."
 msgstr "Server'a bağlantı kurulamadı."
@@ -3232,10 +3237,11 @@
 msgstr "Seçili ilişkiyi sil"
 
-#. item "Land use/Heath" text "Name"
+#. item "Land use/Quarry" text "Name"
+#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2954
 msgid "Relations"
 msgstr "İlişkiler"
@@ -3422,5 +3428,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2599
 msgid "Places"
 msgstr "Yerler"
@@ -3467,21 +3473,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "type"
 msgstr "tip"
@@ -3534,10 +3540,7 @@
 msgstr "Fare veya Ctrl+ok tuşları ile /./  zoom ve pan yapabilirsin."
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
-#. <key key="tourism" value="information" />
-#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Office" text "Opening Hours"
 #: ../core/src/org/openstreetmap/josm/gui/download/WorldChooser.java:104
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1670
 msgid "Map"
 msgstr "Harita"
@@ -3690,4 +3693,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:336
 msgid "OK"
@@ -3790,5 +3794,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:678
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:464
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:209
@@ -3848,19 +3852,34 @@
 "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:142
 msgid "outside downloaded area"
 msgstr "indirilen alanın dışında"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:218
+#, fuzzy, java-format
+msgid "version {0}"
+msgstr "Versiyon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:362
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} şunları içerir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:366
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} silindi.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy
+msgid "unset"
+msgstr "kullanım"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#, fuzzy, java-format
+msgid "API version: {0}"
+msgstr "Versiyon {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:461
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:206
 msgid "Convert to GPX layer"
@@ -3868,21 +3887,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "track"
 msgid_plural "tracks"
@@ -4302,5 +4321,5 @@
 #. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
 #. <space />
-#. <key key="highway" value="mountain_pass" />
+#. <key key="mountain_pass" value="yes" />
 #. <optional>
 #. item "Barriers/Toll Booth" label "Edit Toll Booth"
@@ -4385,4 +4404,6 @@
 #. item "Aerialway/Cable Car" label "Edit Cable Car"
 #. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
@@ -4466,7 +4487,4 @@
 #. item "Tourism/Attraction" label "Edit Attraction"
 #. <key key="tourism" value="attraction" />
-#. item "Tourism/Information Office" label "Edit Information Office"
-#. <key key="tourism" value="information" />
-#. <key key="information" value="office" />
 #. item "Tourism/Museum" label "Edit Museum"
 #. <key key="tourism" value="museum" />
@@ -4479,7 +4497,14 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office" label "Edit Information Office"
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
 #. <key key="tourism" value="information" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -4495,10 +4520,10 @@
 #. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
 #. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
 #. item "Historic Places/Memorial" label "Edit Memorial"
 #. <key key="historic" value="memorial" />
-#. item "Historic Places/Battlefield" label "Edit Battlefield"
-#. <key key="historic" value="battlefield" />
 #. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
 #. <key key="historic" value="wayside_cross" />
@@ -4667,5 +4692,7 @@
 #. item "Shops/Organic" label "Edit Organic Shop"
 #. <key key="shop" value="organic" />
-#. item "Shops/Beverages" label "Edit Beverages  Shop"
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
 #. <key key="shop" value="beverages" />
 #. item "Shops/Computer" label "Edit Computer Shop"
@@ -4699,7 +4726,7 @@
 #. item "Shops/Outdoor" label "Edit Outdoor Shop"
 #. <key key="shop" value="outdoor" />
-#. item "Shops/sports" label "Edit Sports Shop"
+#. item "Shops/Sports" label "Edit Sports Shop"
 #. <key key="shop" value="sports" />
-#. item "Shops/optician" label "Edit Optician"
+#. item "Shops/Optician" label "Edit Optician"
 #. <key key="shop" value="optician" />
 #. item "Cash/Bank" label "Edit Bank"
@@ -4783,4 +4810,12 @@
 #. item "Land use/Nature Reserve" label "Edit Nature Reserve"
 #. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
 #. item "Land use/Farmyard" label "Edit Farmyard Landuse"
 #. <space />
@@ -4833,4 +4868,10 @@
 #. <space />
 #. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
 #. item "Land use/Brownfield" label "Edit Brownfield Landuse"
 #. <space />
@@ -4839,7 +4880,4 @@
 #. <space />
 #. <key key="landuse" value="greenfield" />
-#. item "Land use/Construction area" label "Edit Construction Landuse"
-#. <space />
-#. <key key="landuse" value="construction" />
 #. item "Land use/Landfill" label "Edit Landfill Landuse"
 #. <space />
@@ -4848,15 +4886,4 @@
 #. <space />
 #. <key key="landuse" value="quarry" />
-#. item "Land use/Military" label "Edit Military Landuse"
-#. <space />
-#. <key key="landuse" value="military" />
-#. item "Land use/Scree" label "Edit Scree"
-#. <key key="natural" value="scree" />
-#. item "Land use/Scrub" label "Edit Scrub"
-#. <key key="natural" value="scrub" />
-#. item "Land use/Fell" label "Edit Fell"
-#. <key key="natural" value="fell" />
-#. item "Land use/Heath" label "Edit Heath"
-#. <key key="natural" value="heath" />
 #. item "Relations/Multipolygon" label "Edit Multipolygon"
 #. <key key="type" value="multipolygon" />
@@ -4881,129 +4908,131 @@
 #: build/trans_presets.java:736 build/trans_presets.java:745
 #: build/trans_presets.java:792 build/trans_presets.java:813
-#: build/trans_presets.java:822 build/trans_presets.java:1001
-#: build/trans_presets.java:1037 build/trans_presets.java:1045
-#: build/trans_presets.java:1053 build/trans_presets.java:1061
-#: build/trans_presets.java:1071 build/trans_presets.java:1079
-#: build/trans_presets.java:1084 build/trans_presets.java:1091
-#: build/trans_presets.java:1098 build/trans_presets.java:1103
-#: build/trans_presets.java:1111 build/trans_presets.java:1120
-#: build/trans_presets.java:1126 build/trans_presets.java:1132
-#: build/trans_presets.java:1137 build/trans_presets.java:1143
-#: build/trans_presets.java:1149 build/trans_presets.java:1158
-#: build/trans_presets.java:1167 build/trans_presets.java:1174
-#: build/trans_presets.java:1182 build/trans_presets.java:1195
-#: build/trans_presets.java:1201 build/trans_presets.java:1210
-#: build/trans_presets.java:1216 build/trans_presets.java:1222
-#: build/trans_presets.java:1230 build/trans_presets.java:1285
-#: build/trans_presets.java:1332 build/trans_presets.java:1338
-#: build/trans_presets.java:1344 build/trans_presets.java:1349
-#: build/trans_presets.java:1360 build/trans_presets.java:1368
-#: build/trans_presets.java:1377 build/trans_presets.java:1384
-#: build/trans_presets.java:1390 build/trans_presets.java:1398
-#: build/trans_presets.java:1405 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1429
-#: build/trans_presets.java:1440 build/trans_presets.java:1450
-#: build/trans_presets.java:1460 build/trans_presets.java:1480
-#: build/trans_presets.java:1492 build/trans_presets.java:1503
-#: build/trans_presets.java:1519 build/trans_presets.java:1526
-#: build/trans_presets.java:1541 build/trans_presets.java:1548
-#: build/trans_presets.java:1553 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
+#: build/trans_presets.java:822 build/trans_presets.java:882
+#: build/trans_presets.java:1023 build/trans_presets.java:1031
+#: build/trans_presets.java:1039 build/trans_presets.java:1047
+#: build/trans_presets.java:1057 build/trans_presets.java:1065
+#: build/trans_presets.java:1070 build/trans_presets.java:1077
+#: build/trans_presets.java:1084 build/trans_presets.java:1089
+#: build/trans_presets.java:1097 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1118
+#: build/trans_presets.java:1123 build/trans_presets.java:1129
+#: build/trans_presets.java:1135 build/trans_presets.java:1144
+#: build/trans_presets.java:1153 build/trans_presets.java:1160
+#: build/trans_presets.java:1168 build/trans_presets.java:1181
+#: build/trans_presets.java:1187 build/trans_presets.java:1196
+#: build/trans_presets.java:1202 build/trans_presets.java:1208
+#: build/trans_presets.java:1216 build/trans_presets.java:1271
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1330 build/trans_presets.java:1336
+#: build/trans_presets.java:1342 build/trans_presets.java:1353
+#: build/trans_presets.java:1361 build/trans_presets.java:1370
+#: build/trans_presets.java:1377 build/trans_presets.java:1383
+#: build/trans_presets.java:1391 build/trans_presets.java:1398
+#: build/trans_presets.java:1407 build/trans_presets.java:1415
+#: build/trans_presets.java:1422 build/trans_presets.java:1433
+#: build/trans_presets.java:1443 build/trans_presets.java:1453
+#: build/trans_presets.java:1473 build/trans_presets.java:1485
+#: build/trans_presets.java:1496 build/trans_presets.java:1512
+#: build/trans_presets.java:1519 build/trans_presets.java:1534
+#: build/trans_presets.java:1541 build/trans_presets.java:1546
+#: build/trans_presets.java:1552 build/trans_presets.java:1558
+#: build/trans_presets.java:1563 build/trans_presets.java:1569
+#: build/trans_presets.java:1575 build/trans_presets.java:1583
 #: build/trans_presets.java:1590 build/trans_presets.java:1597
-#: build/trans_presets.java:1604 build/trans_presets.java:1610
-#: build/trans_presets.java:1615 build/trans_presets.java:1621
+#: build/trans_presets.java:1603 build/trans_presets.java:1608
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
 #: build/trans_presets.java:1627 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1662
-#: build/trans_presets.java:1668 build/trans_presets.java:1674
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1699 build/trans_presets.java:1705
-#: build/trans_presets.java:1711 build/trans_presets.java:1721
-#: build/trans_presets.java:1726 build/trans_presets.java:1733
-#: build/trans_presets.java:1738 build/trans_presets.java:1744
-#: build/trans_presets.java:1750 build/trans_presets.java:1755
-#: build/trans_presets.java:1760 build/trans_presets.java:1767
-#: build/trans_presets.java:1773 build/trans_presets.java:1778
-#: build/trans_presets.java:1786 build/trans_presets.java:1795
-#: build/trans_presets.java:1804 build/trans_presets.java:1813
-#: build/trans_presets.java:1822 build/trans_presets.java:1827
-#: build/trans_presets.java:1834 build/trans_presets.java:1840
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1870 build/trans_presets.java:1876
-#: build/trans_presets.java:1882 build/trans_presets.java:1888
-#: build/trans_presets.java:1894 build/trans_presets.java:1900
-#: build/trans_presets.java:1906 build/trans_presets.java:1912
-#: build/trans_presets.java:1918 build/trans_presets.java:1925
-#: build/trans_presets.java:1934 build/trans_presets.java:1942
-#: build/trans_presets.java:1948 build/trans_presets.java:1954
-#: build/trans_presets.java:1960 build/trans_presets.java:1966
-#: build/trans_presets.java:1972 build/trans_presets.java:1978
-#: build/trans_presets.java:1984 build/trans_presets.java:1990
-#: build/trans_presets.java:1996 build/trans_presets.java:2002
-#: build/trans_presets.java:2008 build/trans_presets.java:2014
-#: build/trans_presets.java:2020 build/trans_presets.java:2026
-#: build/trans_presets.java:2032 build/trans_presets.java:2038
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2070
-#: build/trans_presets.java:2077 build/trans_presets.java:2085
-#: build/trans_presets.java:2092 build/trans_presets.java:2098
-#: build/trans_presets.java:2104 build/trans_presets.java:2110
-#: build/trans_presets.java:2116 build/trans_presets.java:2122
-#: build/trans_presets.java:2130 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2150
-#: build/trans_presets.java:2158 build/trans_presets.java:2189
-#: build/trans_presets.java:2194 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2216 build/trans_presets.java:2222
-#: build/trans_presets.java:2230 build/trans_presets.java:2236
-#: build/trans_presets.java:2242 build/trans_presets.java:2248
-#: build/trans_presets.java:2254 build/trans_presets.java:2264
-#: build/trans_presets.java:2357 build/trans_presets.java:2364
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2411
-#: build/trans_presets.java:2417 build/trans_presets.java:2423
-#: build/trans_presets.java:2428 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2443
-#: build/trans_presets.java:2448 build/trans_presets.java:2453
-#: build/trans_presets.java:2459 build/trans_presets.java:2465
-#: build/trans_presets.java:2471 build/trans_presets.java:2476
-#: build/trans_presets.java:2481 build/trans_presets.java:2486
-#: build/trans_presets.java:2491 build/trans_presets.java:2496
-#: build/trans_presets.java:2502 build/trans_presets.java:2508
-#: build/trans_presets.java:2514 build/trans_presets.java:2519
-#: build/trans_presets.java:2524 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2554
-#: build/trans_presets.java:2559 build/trans_presets.java:2566
-#: build/trans_presets.java:2572 build/trans_presets.java:2592
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2625 build/trans_presets.java:2631
-#: build/trans_presets.java:2638 build/trans_presets.java:2645
-#: build/trans_presets.java:2651 build/trans_presets.java:2657
-#: build/trans_presets.java:2664 build/trans_presets.java:2671
-#: build/trans_presets.java:2678 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2698
-#: build/trans_presets.java:2707 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2740
-#: build/trans_presets.java:2750 build/trans_presets.java:2759
-#: build/trans_presets.java:2765 build/trans_presets.java:2773
-#: build/trans_presets.java:2779 build/trans_presets.java:2785
-#: build/trans_presets.java:2791 build/trans_presets.java:2797
+#: build/trans_presets.java:1641 build/trans_presets.java:1647
+#: build/trans_presets.java:1653 build/trans_presets.java:1659
+#: build/trans_presets.java:1667 build/trans_presets.java:1673
+#: build/trans_presets.java:1680 build/trans_presets.java:1688
+#: build/trans_presets.java:1694 build/trans_presets.java:1701
+#: build/trans_presets.java:1707 build/trans_presets.java:1717
+#: build/trans_presets.java:1722 build/trans_presets.java:1729
+#: build/trans_presets.java:1735 build/trans_presets.java:1741
+#: build/trans_presets.java:1747 build/trans_presets.java:1752
+#: build/trans_presets.java:1757 build/trans_presets.java:1764
+#: build/trans_presets.java:1770 build/trans_presets.java:1775
+#: build/trans_presets.java:1783 build/trans_presets.java:1792
+#: build/trans_presets.java:1801 build/trans_presets.java:1810
+#: build/trans_presets.java:1819 build/trans_presets.java:1824
+#: build/trans_presets.java:1831 build/trans_presets.java:1837
+#: build/trans_presets.java:1843 build/trans_presets.java:1849
+#: 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:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 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:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2067
+#: build/trans_presets.java:2074 build/trans_presets.java:2082
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2127 build/trans_presets.java:2134
+#: build/trans_presets.java:2140 build/trans_presets.java:2147
+#: build/trans_presets.java:2155 build/trans_presets.java:2186
+#: build/trans_presets.java:2191 build/trans_presets.java:2196
+#: build/trans_presets.java:2201 build/trans_presets.java:2207
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2227 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: build/trans_presets.java:2251 build/trans_presets.java:2261
+#: build/trans_presets.java:2354 build/trans_presets.java:2361
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2387 build/trans_presets.java:2408
+#: build/trans_presets.java:2414 build/trans_presets.java:2420
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2436 build/trans_presets.java:2441
+#: build/trans_presets.java:2446 build/trans_presets.java:2451
+#: build/trans_presets.java:2456 build/trans_presets.java:2462
+#: build/trans_presets.java:2468 build/trans_presets.java:2474
+#: build/trans_presets.java:2479 build/trans_presets.java:2484
+#: build/trans_presets.java:2489 build/trans_presets.java:2494
+#: build/trans_presets.java:2499 build/trans_presets.java:2505
+#: build/trans_presets.java:2511 build/trans_presets.java:2517
+#: build/trans_presets.java:2522 build/trans_presets.java:2527
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2557 build/trans_presets.java:2562
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2595 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2669
+#: build/trans_presets.java:2676 build/trans_presets.java:2683
+#: build/trans_presets.java:2689 build/trans_presets.java:2696
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2718 build/trans_presets.java:2724
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2745 build/trans_presets.java:2755
+#: build/trans_presets.java:2764 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2781
+#: build/trans_presets.java:2787 build/trans_presets.java:2793
 #: build/trans_presets.java:2802 build/trans_presets.java:2808
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2826 build/trans_presets.java:2833
-#: build/trans_presets.java:2840 build/trans_presets.java:2846
-#: build/trans_presets.java:2855 build/trans_presets.java:2863
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2882 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2901
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2930 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2954
-#: build/trans_presets.java:2968 build/trans_presets.java:2982
+#: build/trans_presets.java:2814 build/trans_presets.java:2820
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2876 build/trans_presets.java:2885
+#: build/trans_presets.java:2893 build/trans_presets.java:2899
+#: build/trans_presets.java:2905 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2925
+#: build/trans_presets.java:2931 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2962 build/trans_presets.java:2976
+#: build/trans_presets.java:2990
 msgid "Name"
 msgstr "İsim"
@@ -5052,12 +5081,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#, fuzzy
 msgid "Local files"
-msgstr "Bütün Mozaikleri Yükle"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
-#, fuzzy
 msgid "None"
-msgstr "boş"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
@@ -5084,45 +5111,35 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "Car"
 msgstr "Araba"
 
-#. item "Barriers/Stile" check "Foot"
-#. item "Barriers/Kissing Gate" check "Foot"
-#. item "Barriers/Hampshire Gate" check "Foot"
 #. item "Barriers/Bollard" check "Foot"
-#. item "Barriers/Drawbridge" check "Foot"
 #. item "Barriers/Cattle Grid" check "Foot"
 #. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
 #. item "Barriers/Gate" check "Foot"
 #. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
-#. item "Barriers/Bump Gate" check "Foot"
-#. item "Barriers/Border Control" check "Foot"
-#. item "Barriers/Entrance" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:309 build/trans_presets.java:635
-#: build/trans_presets.java:836 build/trans_presets.java:845
-#: build/trans_presets.java:854 build/trans_presets.java:867
-#: build/trans_presets.java:878 build/trans_presets.java:894
-#: build/trans_presets.java:905 build/trans_presets.java:928
-#: build/trans_presets.java:940 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:1012
-#: build/trans_presets.java:1025 build/trans_presets.java:1409
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:838 build/trans_presets.java:857
+#: build/trans_presets.java:871 build/trans_presets.java:893
+#: build/trans_presets.java:930 build/trans_presets.java:943
+#: build/trans_presets.java:955 build/trans_presets.java:967
+#: build/trans_presets.java:979 build/trans_presets.java:991
+#: build/trans_presets.java:1001 build/trans_presets.java:1010
+#: build/trans_presets.java:1402 build/trans_presets.java:1475
 msgid "Bicycle"
 msgstr "Bisiklet"
 
-#. item "Barriers/Stile" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Kissing Gate" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
-#. <space />
 #. item "Barriers/Bollard" label "Allowed traffic:"
-#. <space />
-#. item "Barriers/Drawbridge" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Cattle Grid" label "Allowed traffic:"
@@ -5130,25 +5147,30 @@
 #. item "Barriers/Spikes" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Lift Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
 #. <space />
 #. item "Barriers/Bump Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Border Control" label "Allowed traffic:"
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
 #. <space />
-#. item "Barriers/Entrance" label "Allowed traffic:"
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
 #: build/trans_presets.java:310 build/trans_presets.java:637
-#: build/trans_presets.java:835 build/trans_presets.java:844
-#: build/trans_presets.java:853 build/trans_presets.java:866
-#: build/trans_presets.java:877 build/trans_presets.java:893
-#: build/trans_presets.java:904 build/trans_presets.java:927
-#: build/trans_presets.java:939 build/trans_presets.java:951
-#: build/trans_presets.java:963 build/trans_presets.java:1011
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:837 build/trans_presets.java:856
+#: build/trans_presets.java:870 build/trans_presets.java:892
+#: build/trans_presets.java:929 build/trans_presets.java:942
+#: build/trans_presets.java:954 build/trans_presets.java:966
+#: build/trans_presets.java:978 build/trans_presets.java:990
+#: build/trans_presets.java:1000 build/trans_presets.java:1009
 msgid "Foot"
 msgstr "Ayak"
@@ -5196,7 +5218,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
-#, fuzzy
 msgid "Draw lines between raw GPS points"
-msgstr "GPS noktaları boyunca çiz."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:94
@@ -5815,10 +5836,10 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:245
 msgid "NullPointerException, possibly some missing tags."
 msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
 msgid "Preparing data..."
 msgstr "Bilgiler hazırlanıyor..."
@@ -5828,25 +5849,75 @@
 msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:142
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:143
+#, java-format
+msgid ""
+"It supports protocol versions 0.5 and 0.6, while the server says it supports "
+"{0} to {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:147
+#, java-format
+msgid "Communications with {0} established using protocol version {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:267
+msgid "Opening changeset..."
+msgstr "Açılıyor..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:281
+msgid "Closing changeset..."
+msgstr "Kapanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:295
+#, fuzzy
+msgid "No changeset present for diff upload"
+msgstr "Yüklenilecek değişiklik yok."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:304
+msgid "Preparing..."
+msgstr "Hazırlanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid "Uploading..."
+msgstr "Yükleniyor..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy
+msgid "Error processing changeset upload response"
+msgstr "Serverın cevabı tanımlanamdı."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
+msgid "Not initialized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
+msgid "Unknown host"
+msgstr "Tanımsız host"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:80
 msgid "Incorrect password or username."
 msgstr "Hatalı kullanıcı adı veya şifre."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:87
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Uyarı: Şifre düz metin olarak ileticektir."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
 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:93
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:97
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:132
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:134
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
 msgid "Aborting..."
@@ -5857,44 +5928,52 @@
 msgstr "Ayrıştırma sırasında hata oluştu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:165
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:167
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
 msgid "Unknown version"
 msgstr "Bilinmeyen versiyon"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
+msgid "Version number missing from OSM data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
+#, fuzzy, java-format
+msgid "Unknown version: {0}"
+msgstr "Bilinmeyen versiyon"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
 msgid "Found <nd> element in non-way."
 msgstr "<nd>-bileşene erişelemdi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
 msgid "<nd> has zero ref"
 msgstr "<nd> in içi boş"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 msgid "Found <member> element in non-relation."
 msgstr "<member>. eleman ile bağlantı bulunamadı."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ref=0, eksik <member> tanımı."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:260
 msgid "Illegal object with id=0"
 msgstr "Geçersiz obje bulundu id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:307
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Gerekli özellik eksik \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:505
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:463
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:519
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:477
 msgid "Ill-formed node id"
 msgstr "Yanlış tanımlı kavşak bilgisi"
@@ -5904,5 +5983,5 @@
 msgstr "Server'e bağlanıyor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:62
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -5911,5 +5990,5 @@
 "ediniz."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:71
 msgid ""
 "Server returned internal error. Try a reduced area or retry after waiting "
@@ -5918,55 +5997,8 @@
 "Server bir hata bildirdi. Küçük bir alan deneyiniz veya daha sonra yapınız."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Yaptığınız yükleme için kısa bir bilgi yazınız:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
-msgid "Commit comment"
-msgstr "Açıklamayı Kabul Ediniz"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:99
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:114
-#, java-format
-msgid "An error occurred: {0}"
-msgstr "Hata Oluştu: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
-msgid "Opening changeset..."
-msgstr "Açılıyor..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
-msgid "Server does not support changesets"
-msgstr "Bu bu bilgiyi desteklemiyor."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
-msgid "Unknown host"
-msgstr "Tanımsız host"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
-msgid "Preparing..."
-msgstr "Hazırlanıyor..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
-msgid "Uploading..."
-msgstr "Yükleniyor..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
-msgid "Closing changeset..."
-msgstr "Kapanıyor..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
-msgid "Transfer aborted due to error (will wait for 5 seconds):"
-msgstr "Aktarım hata nedeniyle kesildi (5 sn bekle):"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
@@ -6131,6 +6163,6 @@
 #: build/trans_presets.java:617 build/trans_presets.java:618
 #: build/trans_presets.java:619 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364
 msgid "unknown"
 msgstr "bilinmeyen"
@@ -6315,7 +6347,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
-#, fuzzy
 msgid "Create grid of ways"
-msgstr "Alanları Oluştur"
+msgstr ""
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
@@ -6334,7 +6365,6 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
-#, fuzzy
 msgid "Create a grid of ways"
-msgstr "Alanları Oluştur"
+msgstr ""
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
@@ -6358,5 +6388,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2993
 msgid "Description"
 msgstr ""
@@ -7604,7 +7634,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:827 build/trans_style.java:844
-#: build/trans_style.java:860 build/trans_style.java:3076
-#: build/trans_style.java:3084
+#: build/trans_style.java:946 build/trans_style.java:963
+#: build/trans_style.java:979 build/trans_style.java:3334
+#: build/trans_style.java:3342
 msgid "water"
 msgstr "su"
@@ -7906,5 +7936,5 @@
 msgstr "OpenStreet Hata indirme döngüsü"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:101
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
 msgid "Displays OpenStreetBugs issues"
 msgstr "OpenStreet hatalarını göster"
@@ -7922,4 +7952,11 @@
 msgid "Warning"
 msgstr "Uyarı"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:125
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Hata Oluştu: {0}"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
@@ -7946,35 +7983,38 @@
 msgstr "Görünen alan çok büyük veya çok küçük, indirmeye uygun değil"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:46
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:50
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:63
 msgid "Add a comment"
 msgstr "Yorum Ekle"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:51
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:64
 msgid "Enter your comment"
 msgstr "Yorumunu Ekle"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:47
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:52
 msgid "Mark as done"
 msgstr "Yapılmış olarak işaretle"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:53
-msgid "Really mark this issue as ''done''?"
-msgstr "Gerçekten  ''yapılmış'' olarak işaretlemek istiyormusunuz?"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:54
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:64
 msgid "Really close?"
 msgstr "Gerçekten Kapat?"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:60
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:65
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
 msgid "New issue"
 msgstr "Yeni konu"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:107
+msgid "Create issue"
+msgstr "Konu oluştur"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:108
 msgid "Describe the problem precisely"
 msgstr "problemi detaylı olarak anlatınız"
-
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:98
-msgid "Create issue"
-msgstr "Konu oluştur"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:92
@@ -8003,5 +8043,5 @@
 msgstr "Osmarender"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:88
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:92
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -8011,9 +8051,9 @@
 "ayarlarını yapınız"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:119
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:123
 msgid "osmarender options"
 msgstr "osmarender seçenekleri"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:120
+#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
 msgid "Firefox executable"
 msgstr "Firefox exe"
@@ -8083,95 +8123,76 @@
 msgstr "Şu linkten uzak kontrolle veri alınmak istenildi.Link:"
 
-#. Add routing layer
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:134
-msgid "Navigation"
-msgstr "Navigasyon"
-
+#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:135
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:207
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:83
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:98
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:84
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:64
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:143
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:168
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+msgid "Routing"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
 #, fuzzy
-msgid "Routing"
-msgstr "Hiçbişey"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:84
-#, fuzzy
-msgid "Click to add route nodes."
-msgstr "Yeni kavşak eklemek için tıklayınız."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:99
-#, fuzzy
-msgid "Click and drag to move route nodes."
-msgstr "Yeni kavşak eklemek için tıklayınız."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:85
-#, fuzzy
-msgid "Remove route nodes"
-msgstr "Çift noktalar kaldırılıyor..."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:63
-#, fuzzy
+msgid "Click to add destination."
+msgstr "varış"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr "İlişkilerin listesini göster."
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:73
-#, fuzzy
-msgid "Start routing"
-msgstr "İstasyon"
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:76
+msgid "Add routing layer"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:87
-#, fuzzy
 msgid "Criteria"
-msgstr "üçüncül"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:89
-#, fuzzy
 msgid "Shortest"
-msgstr "Kısayol"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:108
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:112
 msgid "Fastest"
-msgstr "Hızlı"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:131
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:138
 msgid "Reverse route"
-msgstr "Yolları ters çevir"
-
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:140
-#, fuzzy
+msgstr ""
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:151
 msgid "Clear route"
-msgstr "feribot hat"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Routing Plugin Preferences"
-msgstr "WMS Eklenti Tercihleri"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:85
-#, fuzzy
 msgid "Configure routing preferences."
-msgstr "Eklenti sitelerini ayarla"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:90
-#, fuzzy
 msgid "Highway type"
-msgstr "otoyol çıkış"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
-#, fuzzy
 msgid "Speed (Km/h)"
-msgstr "Max. hız (km/sa)"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:113
-#, fuzzy
 msgid "Weight"
-msgstr "Yükseklik"
+msgstr ""
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:122
@@ -8179,33 +8200,33 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:61
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
 msgid "Slippy Map"
 msgstr "Hareketli Harita"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:67
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
 msgid "Load Tile"
 msgstr "Mozaik Yükle"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:78
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
 msgid "Show Tile Status"
 msgstr "Mozaik Durumunu Göster"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:89
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
 msgid "Request Update"
 msgstr "Güncelleme İste"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:100
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
 msgid "Load All Tiles"
 msgstr "Bütün Mozaikleri Yükle"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:110
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:119
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:379
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
 msgid "image not loaded"
 msgstr "görüntü yüklenemedi"
@@ -8228,34 +8249,34 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
 msgid "Tile Sources"
 msgstr "Mozaik Kaynakları"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:50
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
 msgid "Auto zoom: "
 msgstr ""
 
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+msgid "Autoload Tiles: "
+msgstr ""
+
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
-msgid "Autoload Tiles: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:60
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:65
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Fade background: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:76
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
 msgid "error loading metadata"
 msgstr "meta veri yüklemesinde hata"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:90
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
 #, java-format
 msgid "requested: {0}"
 msgstr "istendi: {0}"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:94
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
 msgid "error requesting update"
 msgstr "güncelleme isteğinde hata"
@@ -8270,5 +8291,5 @@
 msgstr "Yakalanan veriyi her dakika otomatik sakla."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:63
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -8323,7 +8344,6 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:61
-#, fuzzy
 msgid "Edit tags"
-msgstr "İl Düzenle"
+msgstr ""
 
 #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
@@ -8338,57 +8358,51 @@
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:29
-#, fuzzy
 msgid "(none)"
-msgstr "boş"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
-#, fuzzy
 msgid "Highlight"
-msgstr "Yükseklik"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-#, fuzzy
 msgid "<multiple>"
-msgstr "çoğul"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:354
-#, fuzzy, java-format
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:353
+#, java-format
 msgid "Remove old keys from up to {0} object"
 msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Değerleri {0} obje için değiştir"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:384
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:383
+#, java-format
 msgid "Updating properties of up to {0} object"
 msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Değerleri {0} obje için değiştir"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
-#, fuzzy
 msgid "Group"
-msgstr "rut"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
-#, fuzzy
 msgid "Item"
-msgstr "dere"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
-#, fuzzy
 msgid "Search: "
-msgstr "Arama"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-#, fuzzy
 msgid "Filter"
-msgstr "Dosya"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:62
-#, fuzzy
 msgid "Clear"
-msgstr "Araba"
+msgstr ""
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -8472,5 +8486,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2168
 msgid "Street name"
 msgstr "Sokak Adı"
@@ -8575,17 +8589,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
-#, fuzzy
 msgid "Fix relations"
-msgstr "ilişki"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
-#, fuzzy
 msgid "Joined self-overlapping area"
-msgstr "Üstüste gelen alanlar"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
-#, fuzzy
 msgid "Joined overlapping areas"
-msgstr "Üstüste gelen alanlar"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
@@ -8596,12 +8607,10 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
-#, fuzzy
 msgid "Fix tag conflicts"
-msgstr "Çelişkileri Birleştir."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
-#, fuzzy
 msgid "Removed Element from Relations"
-msgstr "Seçimden çıkartınız"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
@@ -8610,17 +8619,14 @@
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
-#, fuzzy
 msgid "Closed Way"
-msgstr "Kapanmamış yollar."
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
-#, fuzzy
 msgid "Remove tags from inner ways"
-msgstr "Fotoğrafı tabakadan kaldır"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
-#, fuzzy
 msgid "Join Areas Function"
-msgstr "Otoyol Kavşağı"
+msgstr ""
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
@@ -9213,4 +9219,10 @@
 #. </rule>
 #.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#. <linemod mode="under" width="10" colour="#808000"/>
+#. </rule>
+#.
 #. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
 #. <rule>
@@ -9292,7 +9304,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:3797 build/trans_style.java:3804
-#: build/trans_style.java:3811 build/trans_style.java:3818
-#: build/trans_style.java:3825
+#: build/trans_style.java:4069 build/trans_style.java:4076
+#: build/trans_style.java:4083 build/trans_style.java:4090
+#: build/trans_style.java:4097
 msgid "building"
 msgstr "yapılar"
@@ -9306,5 +9318,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:3832
+#: build/trans_style.java:4104
 msgid "area"
 msgstr "alan"
@@ -9604,4 +9616,9 @@
 msgstr "ses akış dosya linki alınamadı"
 
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
 #. Plugin AgPifoJ
 #: build/trans_plugins.java:3
@@ -9628,7 +9645,6 @@
 #. Plugin Create_grid_of_ways
 #: build/trans_plugins.java:9
-#, fuzzy
 msgid "Create a grid of ways."
-msgstr "Alanları Oluştur"
+msgstr ""
 
 #. Plugin DirectUpload
@@ -9719,21 +9735,28 @@
 msgstr ""
 
+#. Plugin PicLayer
+#: build/trans_plugins.java:39
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
 #. Plugin plastic_laf
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routing
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -9742,15 +9765,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -9760,15 +9783,15 @@
 
 #. Plugin tcx-support
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Directly load TCX files from JOSM."
 msgstr ""
 
 #. Plugin terracer
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -9777,5 +9800,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -9784,5 +9807,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -9791,5 +9814,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -9879,5 +9902,5 @@
 #: build/trans_presets.java:109 build/trans_presets.java:128
 #: build/trans_presets.java:163 build/trans_presets.java:183
-#: build/trans_presets.java:1528 build/trans_presets.java:2983
+#: build/trans_presets.java:1521 build/trans_presets.java:2991
 msgid "Reference"
 msgstr "Referans"
@@ -9932,7 +9955,7 @@
 #: build/trans_presets.java:553 build/trans_presets.java:574
 #: build/trans_presets.java:595 build/trans_presets.java:616
-#: build/trans_presets.java:645 build/trans_presets.java:1046
-#: build/trans_presets.java:1054 build/trans_presets.java:1062
-#: build/trans_presets.java:1072 build/trans_presets.java:1291
+#: build/trans_presets.java:645 build/trans_presets.java:1032
+#: build/trans_presets.java:1040 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1277
 msgid "Layer"
 msgstr "Tabaka"
@@ -9975,5 +9998,5 @@
 #: build/trans_presets.java:436 build/trans_presets.java:455
 #: build/trans_presets.java:493 build/trans_presets.java:647
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1279
 msgid "Max. speed (km/h)"
 msgstr "Max. hız (km/sa)"
@@ -10021,5 +10044,5 @@
 #: build/trans_presets.java:429 build/trans_presets.java:448
 #: build/trans_presets.java:467 build/trans_presets.java:486
-#: build/trans_presets.java:640 build/trans_presets.java:1286
+#: build/trans_presets.java:640 build/trans_presets.java:1272
 msgid "Oneway"
 msgstr "TekYol"
@@ -10075,5 +10098,5 @@
 #: build/trans_presets.java:569 build/trans_presets.java:590
 #: build/trans_presets.java:611 build/trans_presets.java:641
-#: build/trans_presets.java:1287 build/trans_surveyor.java:12
+#: build/trans_presets.java:1273 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "köprü"
@@ -10123,5 +10146,5 @@
 #: build/trans_presets.java:570 build/trans_presets.java:591
 #: build/trans_presets.java:612 build/trans_presets.java:642
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1274
 msgid "Tunnel"
 msgstr "Tunel"
@@ -10168,5 +10191,5 @@
 #: build/trans_presets.java:550 build/trans_presets.java:571
 #: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:643 build/trans_presets.java:1289
+#: build/trans_presets.java:643 build/trans_presets.java:1275
 msgid "Cutting"
 msgstr "Kesen"
@@ -10213,5 +10236,5 @@
 #: build/trans_presets.java:551 build/trans_presets.java:572
 #: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:644 build/trans_presets.java:1290
+#: build/trans_presets.java:644 build/trans_presets.java:1276
 msgid "Embankment"
 msgstr "toprak set"
@@ -10369,6 +10392,6 @@
 #: 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:1294
-#: build/trans_presets.java:1470 build/trans_presets.java:1511
+#: build/trans_presets.java:726 build/trans_presets.java:1280
+#: build/trans_presets.java:1463 build/trans_presets.java:1504
 msgid "Width (meters)"
 msgstr ""
@@ -10417,5 +10440,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "Surface"
 msgstr "Yüzey"
@@ -10447,5 +10470,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "paved"
 msgstr "kaldırım"
@@ -10456,5 +10479,5 @@
 #: build/trans_presets.java:435 build/trans_presets.java:454
 #: build/trans_presets.java:473 build/trans_presets.java:492
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "unpaved"
 msgstr "kaldırımsız"
@@ -10468,5 +10491,5 @@
 #: build/trans_presets.java:552 build/trans_presets.java:573
 #: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:646 build/trans_presets.java:1292
+#: build/trans_presets.java:646 build/trans_presets.java:1278
 msgid "cobblestone"
 msgstr "parke taşı"
@@ -10618,5 +10641,5 @@
 #. item "Ways/Path" combo "Foot"
 #. item "Car/Parking" combo "Spaces for Disabled"
-#. item "Amenities/Toilets" combo "Charge"
+#. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
 #: build/trans_presets.java:308 build/trans_presets.java:309
@@ -10637,6 +10660,6 @@
 #: build/trans_presets.java:633 build/trans_presets.java:634
 #: build/trans_presets.java:635 build/trans_presets.java:636
-#: build/trans_presets.java:637 build/trans_presets.java:1371
-#: build/trans_presets.java:2307 build/trans_presets.java:2565
+#: build/trans_presets.java:637 build/trans_presets.java:1364
+#: build/trans_presets.java:2304 build/trans_presets.java:2568
 msgid "yes"
 msgstr "Evet"
@@ -10780,7 +10803,7 @@
 #: build/trans_presets.java:635 build/trans_presets.java:636
 #: build/trans_presets.java:637 build/trans_presets.java:754
-#: build/trans_presets.java:769 build/trans_presets.java:1316
-#: build/trans_presets.java:1371 build/trans_presets.java:2307
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:769 build/trans_presets.java:1302
+#: build/trans_presets.java:1364 build/trans_presets.java:2304
+#: build/trans_presets.java:2568
 msgid "no"
 msgstr "hayır"
@@ -10794,73 +10817,63 @@
 msgstr "Ağır araç"
 
-#. item "Barriers/Hampshire Gate" check "Bicycle"
 #. item "Barriers/Bollard" check "Bicycle"
-#. item "Barriers/Drawbridge" check "Bicycle"
 #. item "Barriers/Spikes" check "Bicycle"
-#. item "Barriers/Portcullis" label "Allowed traffic:"
-#. <space />
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
 #. item "Barriers/Gate" check "Bicycle"
 #. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#. item "Barriers/Bump Gate" check "Bicycle"
-#. item "Barriers/Border Control" check "Bicycle"
-#. item "Barriers/Entrance" check "Bicycle"
 #: build/trans_presets.java:313 build/trans_presets.java:634
-#: build/trans_presets.java:855 build/trans_presets.java:868
-#: build/trans_presets.java:879 build/trans_presets.java:906
-#: build/trans_presets.java:916 build/trans_presets.java:929
-#: build/trans_presets.java:941 build/trans_presets.java:953
-#: build/trans_presets.java:965 build/trans_presets.java:1013
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:839 build/trans_presets.java:872
+#: build/trans_presets.java:894 build/trans_presets.java:931
+#: build/trans_presets.java:944 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:1011
 msgid "Horse"
 msgstr "AT"
 
-#. item "Barriers/Hampshire Gate" check "Horse"
 #. item "Barriers/Bollard" check "Horse"
-#. item "Barriers/Drawbridge" check "Horse"
 #. item "Barriers/Cattle Grid" check "Bicycle"
 #. item "Barriers/Spikes" check "Horse"
-#. item "Barriers/Portcullis" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
 #. item "Barriers/Gate" check "Horse"
 #. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#. item "Barriers/Bump Gate" check "Horse"
-#. item "Barriers/Border Control" check "Horse"
-#. item "Barriers/Entrance" check "Horse"
 #: build/trans_presets.java:314 build/trans_presets.java:513
 #: build/trans_presets.java:534 build/trans_presets.java:555
 #: build/trans_presets.java:576 build/trans_presets.java:597
-#: build/trans_presets.java:618 build/trans_presets.java:856
-#: build/trans_presets.java:869 build/trans_presets.java:880
-#: build/trans_presets.java:895 build/trans_presets.java:907
-#: build/trans_presets.java:917 build/trans_presets.java:930
-#: build/trans_presets.java:942 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:1014
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:618 build/trans_presets.java:840
+#: build/trans_presets.java:858 build/trans_presets.java:873
+#: build/trans_presets.java:895 build/trans_presets.java:932
+#: build/trans_presets.java:945 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:1012
 msgid "Motorcycle"
 msgstr "Motosiklet"
 
 #. item "Ways/Path" label "Type"
-#. item "Barriers/Hampshire Gate" check "Motorcycle"
-#. item "Barriers/Drawbridge" check "Motorcycle"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
-#. item "Barriers/Portcullis" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
 #. item "Barriers/Gate" check "Motorcycle"
 #. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#. item "Barriers/Bump Gate" check "Motorcycle"
-#. item "Barriers/Border Control" check "Motorcycle"
-#. item "Barriers/Entrance" check "Motorcycle"
 #: build/trans_presets.java:315 build/trans_presets.java:514
 #: build/trans_presets.java:535 build/trans_presets.java:556
 #: build/trans_presets.java:577 build/trans_presets.java:598
 #: build/trans_presets.java:619 build/trans_presets.java:632
-#: build/trans_presets.java:857 build/trans_presets.java:881
-#: build/trans_presets.java:896 build/trans_presets.java:908
-#: build/trans_presets.java:918 build/trans_presets.java:931
-#: build/trans_presets.java:943 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:1015
-#: build/trans_presets.java:1028
+#: build/trans_presets.java:859 build/trans_presets.java:874
+#: build/trans_presets.java:896 build/trans_presets.java:933
+#: build/trans_presets.java:946 build/trans_presets.java:958
+#: build/trans_presets.java:970 build/trans_presets.java:982
+#: build/trans_presets.java:1013
 msgid "Motorcar"
 msgstr "otomobil"
@@ -10935,130 +10948,18 @@
 #. item "Land use/Forest" text "Name"
 #: build/trans_presets.java:334 build/trans_presets.java:631
-#: build/trans_presets.java:769 build/trans_presets.java:1121
-#: build/trans_presets.java:1370 build/trans_presets.java:2263
-#: build/trans_presets.java:2741 build/trans_presets.java:2751
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:769 build/trans_presets.java:1107
+#: build/trans_presets.java:1363 build/trans_presets.java:2260
+#: build/trans_presets.java:2746 build/trans_presets.java:2756
+#: build/trans_presets.java:2765
 msgid "Type"
 msgstr "Tip"
 
 #. item "Streets/Roundabout" combo "Type"
-#. color horse
-#. <icon src="vehicle/restriction/horse-designated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcycle" b="no"/>
-#. <icon src="vehicle/restriction/motorbike.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorcar" b="no"/>
-#. <icon src="vehicle/restriction/motorcar.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="psv" b="no"/>
-#. <icon src="vehicle/restriction/psv.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="motorboat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="boat" b="no"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="noexit" b="yes"/>
-#. <icon src="vehicle/restriction/dead_end.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxweight"/>
-#. <icon src="vehicle/restriction/maxweight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxheight"/>
-#. <icon src="vehicle/restriction/maxheight.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxwidth"/>
-#. <icon src="vehicle/restriction/maxwidth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxlength"/>
-#. <icon src="vehicle/restriction/maxlength.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxspeed"/>
-#. <icon src="vehicle/restriction/speed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="minspeed"/>
-#. <icon src="vehicle/restriction/minspeed.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="maxstay"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="toll"/>
-#. <icon src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="barrier" v="bollard"/>
-#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="gate"/>
-#. <icon annotate="true" src="vehicle/gate.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="speed_bump"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11066,5 +10967,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="hedge"/>
+#. <condition k="barrier" v="bump_gate"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11072,11 +10973,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="stile"/>
-#. <icon annotate="true" src="vehicle/stile.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="fence"/>
+#. <condition k="barrier" v="sally_port"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11084,5 +10979,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wood_fence"/>
+#. <condition k="barrier" v="portcullis"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11090,5 +10985,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="wire_fence"/>
+#. <condition k="barrier" v="spikes"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11096,5 +10991,5 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier" v="cycle_barrier"/>
+#. <condition k="barrier" v="bus_trap"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
@@ -11102,6 +10997,12 @@
 #. </rule>
 #. <rule>
-#. <condition k="barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11120,6 +11021,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:417
-#: build/trans_style.java:425
+#: build/trans_presets.java:334 build/trans_style.java:509
+#: build/trans_style.java:517
 msgid "motorway"
 msgstr "araçyolu"
@@ -11145,6 +11046,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:433
-#: build/trans_style.java:441
+#: build/trans_presets.java:334 build/trans_style.java:525
+#: build/trans_style.java:533
 msgid "trunk"
 msgstr "ana_hat"
@@ -11170,6 +11071,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:449
-#: build/trans_style.java:457
+#: build/trans_presets.java:334 build/trans_style.java:541
+#: build/trans_style.java:549
 msgid "primary"
 msgstr "birincil"
@@ -11195,6 +11096,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:334 build/trans_style.java:465
-#: build/trans_style.java:473
+#: build/trans_presets.java:334 build/trans_style.java:557
+#: build/trans_style.java:565
 msgid "secondary"
 msgstr "ikincil"
@@ -11208,5 +11109,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:334 build/trans_style.java:481
+#: build/trans_presets.java:334 build/trans_style.java:573
 msgid "tertiary"
 msgstr "üçüncül"
@@ -11224,5 +11125,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:334 build/trans_style.java:2837
+#: build/trans_presets.java:334 build/trans_style.java:3085
 msgid "residential"
 msgstr "yerleşim_alanı"
@@ -11240,5 +11141,5 @@
 #. <rule>
 #. <condition k="highway" v="service"/>
-#: build/trans_presets.java:334 build/trans_style.java:537
+#: build/trans_presets.java:334 build/trans_style.java:629
 msgid "service"
 msgstr "servis"
@@ -11265,6 +11166,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:334 build/trans_style.java:722
-#: build/trans_style.java:2902 build/trans_style.java:2903
+#: build/trans_presets.java:334 build/trans_style.java:833
+#: build/trans_style.java:3150 build/trans_style.java:3151
 msgid "construction"
 msgstr "inşaat"
@@ -11305,6 +11206,5 @@
 
 #. item "Ways/Construction" combo "Junction"
-#. color construction
-#. <icon src="misc/construction.png"/>
+#. color emergency_access_point
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -11315,5 +11215,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:396 build/trans_style.java:732
+#: build/trans_presets.java:396 build/trans_style.java:851
 msgid "roundabout"
 msgstr "roundabout-döner kavşak"
@@ -11657,14 +11557,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:746 build/trans_presets.java:1002
-#: build/trans_presets.java:1361 build/trans_presets.java:1378
-#: build/trans_presets.java:1385 build/trans_presets.java:1391
-#: build/trans_presets.java:1399 build/trans_presets.java:1406
-#: build/trans_presets.java:2271 build/trans_presets.java:2278
-#: build/trans_presets.java:2294 build/trans_presets.java:2305
-#: build/trans_presets.java:2313 build/trans_presets.java:2320
-#: build/trans_presets.java:2370 build/trans_presets.java:2397
-#: build/trans_presets.java:2546 build/trans_presets.java:2582
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:746 build/trans_presets.java:883
+#: build/trans_presets.java:1354 build/trans_presets.java:1371
+#: build/trans_presets.java:1378 build/trans_presets.java:1384
+#: build/trans_presets.java:1392 build/trans_presets.java:1399
+#: build/trans_presets.java:2268 build/trans_presets.java:2275
+#: build/trans_presets.java:2291 build/trans_presets.java:2302
+#: build/trans_presets.java:2310 build/trans_presets.java:2317
+#: build/trans_presets.java:2367 build/trans_presets.java:2394
+#: build/trans_presets.java:2549 build/trans_presets.java:2585
+#: build/trans_presets.java:2996
 msgid "Operator"
 msgstr "Operator"
@@ -11689,20 +11589,20 @@
 #. item "Railway/Crossing" combo "Crossing type"
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "uncontrolled"
 msgstr "kontrolsuz"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "traffic_signals"
 msgstr ""
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "island"
 msgstr "ada"
 
 #: build/trans_presets.java:754 build/trans_presets.java:769
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "unmarked"
 msgstr ""
@@ -11710,5 +11610,5 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:755 build/trans_presets.java:771
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1303
 msgid "Cross on horseback"
 msgstr ""
@@ -11717,5 +11617,5 @@
 #. item "Railway/Crossing" check "Cross on horseback"
 #: build/trans_presets.java:756 build/trans_presets.java:770
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1304
 msgid "Cross by bicycle"
 msgstr ""
@@ -11725,5 +11625,5 @@
 #. item "Railway/Crossing" check "Cross by bicycle"
 #: build/trans_presets.java:757 build/trans_presets.java:772
-#: build/trans_presets.java:1319
+#: build/trans_presets.java:1305
 msgid "Crossing attendant"
 msgstr ""
@@ -11872,10 +11772,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost (Hiking)" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:823 build/trans_presets.java:1571
-#: build/trans_presets.java:2685 build/trans_presets.java:2692
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:823 build/trans_presets.java:1564
+#: build/trans_presets.java:1689 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2704
 msgid "Elevation"
 msgstr "yükseklik"
@@ -11888,29 +11789,18 @@
 
 #. group "Barriers"
-#: build/trans_presets.java:828
-msgid "Stile"
-msgstr "Stil"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#. <!-- *** node barriers *** -->
 #: build/trans_presets.java:830
-msgid "Edit Stile"
-msgstr "Stil düzenle"
-
-#. item "Barriers/Stile" label "Edit Stile"
-#. <space />
-#. <key key="barrier" value="stile" />
-#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
-#. <space />
-#. <key key="barrier" value="kissing_gate" />
-#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
-#. <space />
-#. <key key="barrier" value="hampshire_gate" />
+msgid "Bollard"
+msgstr "direk-iskele"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:832
+msgid "Edit Bollard"
+msgstr "direk-iskele düzenle"
+
 #. item "Barriers/Bollard" label "Edit Bollard"
 #. <space />
 #. <key key="barrier" value="bollard" />
-#. item "Barriers/Drawbridge" label "Edit Drawbridge"
-#. <space />
-#. <key key="barrier" value="drawbridge" />
 #. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
 #. <space />
@@ -11919,7 +11809,10 @@
 #. <space />
 #. <key key="barrier" value="spikes" />
-#. item "Barriers/Portcullis" label "Edit Portcullis"
+#. item "Barriers/Border Control" label "Edit Border Control"
 #. <space />
-#. <key key="barrier" value="portcullis" />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
 #. item "Barriers/Gate" label "Edit Gate"
 #. <space />
@@ -11928,235 +11821,223 @@
 #. <space />
 #. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#. item "Barriers/Bump Gate" label "Edit Bump Gate"
-#. <space />
-#. <key key="barrier" value="bump_gate" />
-#. item "Barriers/Border Control" label "Edit Border Control"
-#. <space />
-#. <key key="barrier" value="border_control" />
-#. item "Barriers/Entrance" label "Edit Entrance"
-#. <space />
-#. <key key="barrier" value="entrance" />
-#: build/trans_presets.java:833 build/trans_presets.java:842
-#: build/trans_presets.java:851 build/trans_presets.java:864
-#: build/trans_presets.java:875 build/trans_presets.java:891
-#: build/trans_presets.java:902 build/trans_presets.java:914
-#: build/trans_presets.java:925 build/trans_presets.java:937
-#: build/trans_presets.java:949 build/trans_presets.java:961
-#: build/trans_presets.java:1009 build/trans_presets.java:1022
+#: build/trans_presets.java:835 build/trans_presets.java:854
+#: build/trans_presets.java:868 build/trans_presets.java:890
+#: build/trans_presets.java:927 build/trans_presets.java:940
+#: build/trans_presets.java:952 build/trans_presets.java:964
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:998 build/trans_presets.java:1007
 msgid "Allowed traffic:"
 msgstr "İzin verilen trafik:"
 
-#. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:838
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:842
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:846
+msgid "Block"
+msgstr "Blok"
+
+#. item
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:849
+msgid "Cattle Grid"
+msgstr "Hayvan Kapısı"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:851
+msgid "Edit Cattle Grid"
+msgstr "Hayvan Kapısı Düzenle"
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:861
+msgid "Bus Trap"
+msgstr "otobüs geçidi"
+
+#. item
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:864
+msgid "Spikes"
+msgstr "Spikes"
+
+#. item
+#: build/trans_presets.java:865
+msgid "Edit Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:876
+msgid "Toll Booth"
+msgstr "gişe"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:878
+msgid "Edit Toll Booth"
+msgstr "gişe  düzenle"
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:886
+msgid "Border Control"
+msgstr "Sınır kontrol noktası"
+
+#. item
+#: build/trans_presets.java:887
+msgid "Edit Border Control"
+msgstr "Sınır kontrol noktası düzenle"
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:901
+msgid "Hedge"
+msgstr "Çalı Çit"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#: build/trans_presets.java:905
+msgid "Fence"
+msgstr "Çit"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#. <key key="barrier" value="fence" />
+#: build/trans_presets.java:909
+msgid "Wall"
+msgstr "Duvar"
+
+#. item
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:912
+msgid "City Wall"
+msgstr "Şehir Duvarı"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:916
+msgid "Retaining Wall"
+msgstr "istinat duvarı"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:923
+msgid "Entrance"
+msgstr "Giriş"
+
+#. item
+#: build/trans_presets.java:924
+msgid "Edit Entrance"
+msgstr "Giriş düzenle"
+
+#. item "Barriers/Entrance" check "Motorcar"
+#: build/trans_presets.java:935
+msgid "Gate"
+msgstr "Geçit"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:937
+msgid "Edit Gate"
+msgstr "Geçit Düzenle"
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:948
+msgid "Lift Gate"
+msgstr "Kalkan geçit"
+
+#. item
+#: build/trans_presets.java:949
+msgid "Edit Lift Gate"
+msgstr "kalkan geçit düzenle"
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:960
+msgid "Hampshire Gate"
+msgstr "Hampshire Geçidi"
+
+#. item
+#: build/trans_presets.java:961
+msgid "Edit Hampshire Gate"
+msgstr "Hampshire Geçidi Düzenle"
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:972
+msgid "Bump Gate"
+msgstr "Hız engeli"
+
+#. item
+#: build/trans_presets.java:973
+msgid "Edit Bump Gate"
+msgstr "Hız engeli düzenle"
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:984
 msgid "Kissing Gate"
 msgstr "geçit"
 
 #. item
-#: build/trans_presets.java:839
+#: build/trans_presets.java:985
 msgid "Edit Kissing Gate"
 msgstr "geçit düzenle"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:847
-msgid "Hampshire Gate"
-msgstr "Hampshire Geçidi"
-
-#. item
-#: build/trans_presets.java:848
-msgid "Edit Hampshire Gate"
-msgstr "Hampshire Geçidi Düzenle"
-
-#. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:859
-msgid "Bollard"
-msgstr "direk-iskele"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:861
-msgid "Edit Bollard"
-msgstr "direk-iskele düzenle"
-
-#. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:871
-msgid "Drawbridge"
-msgstr "Asma Köprü"
-
-#. item
-#: build/trans_presets.java:872
-msgid "Edit Drawbridge"
-msgstr "Asma Köprü düzenle"
-
-#. item "Barriers/Drawbridge" check "Motorcar"
-#: build/trans_presets.java:883
-msgid "Bus Trap"
-msgstr "otobüs geçidi"
-
-#. item
-#. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:886
-msgid "Cattle Grid"
-msgstr "Hayvan Kapısı"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:888
-msgid "Edit Cattle Grid"
-msgstr "Hayvan Kapısı Düzenle"
-
-#. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:898
-msgid "Spikes"
-msgstr "Spikes"
-
-#. item
-#: build/trans_presets.java:899
-msgid "Edit Spikes"
-msgstr ""
-
-#. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:910
-msgid "Portcullis"
-msgstr "Demir parmaklık"
-
-#. item
-#: build/trans_presets.java:911
-msgid "Edit Portcullis"
-msgstr "Demir parmaklık düzenle"
-
-#. item "Barriers/Portcullis" check "Motorcar"
-#: build/trans_presets.java:920
-msgid "Gate"
-msgstr "Geçit"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:922
-msgid "Edit Gate"
-msgstr "Geçit Düzenle"
-
-#. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:933
-msgid "Lift Gate"
-msgstr "Kalkan geçit"
-
-#. item
-#: build/trans_presets.java:934
-msgid "Edit Lift Gate"
-msgstr "kalkan geçit düzenle"
-
-#. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:945
+#: build/trans_presets.java:993
+msgid "Stile"
+msgstr "Stil"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:995
+msgid "Edit Stile"
+msgstr "Stil düzenle"
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:1003
 msgid "Sally Port"
 msgstr "Çıkış Kapısı-asker"
 
 #. item
-#: build/trans_presets.java:946
+#: build/trans_presets.java:1004
 msgid "Edit Sally Port"
 msgstr "Çıkış Kapısı-asker düzenle"
 
 #. item "Barriers/Sally Port" check "Motorcar"
-#: build/trans_presets.java:957
-msgid "Bump Gate"
-msgstr "Hız engeli"
-
-#. item
-#: build/trans_presets.java:958
-msgid "Edit Bump Gate"
-msgstr "Hız engeli düzenle"
-
-#. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:969
-msgid "Cycle Barrier"
-msgstr ""
-
-#. item
-#. unparsed line             <link href:de="http://de.wikipedia.org/wiki/Umlaufgitter" />
-#. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:973
-msgid "Hedge"
-msgstr "Çalı Çit"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
-#. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:977
-msgid "Fence"
-msgstr "Çit"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:981
-msgid "Block"
-msgstr "Blok"
-
-#. item
-#. <key key="barrier" value="block" />
-#: build/trans_presets.java:984
-msgid "Wall"
-msgstr "Duvar"
-
-#. item
-#. <key key="barrier" value="wall" />
-#: build/trans_presets.java:987
-msgid "City Wall"
-msgstr "Şehir Duvarı"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
-#. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:991
-msgid "Retaining Wall"
-msgstr "istinat duvarı"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
-#. <key key="barrier" value="retaining_wall" />
-#: build/trans_presets.java:995
-msgid "Toll Booth"
-msgstr "gişe"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:997
-msgid "Edit Toll Booth"
-msgstr "gişe  düzenle"
-
-#. item "Barriers/Toll Booth" text "Operator"
-#. </optional>
-#: build/trans_presets.java:1005
-msgid "Border Control"
-msgstr "Sınır kontrol noktası"
-
-#. item
-#: build/trans_presets.java:1006
-msgid "Edit Border Control"
-msgstr "Sınır kontrol noktası düzenle"
-
-#. item "Barriers/Border Control" check "Motorcar"
-#. <separator/>
-#: build/trans_presets.java:1018
-msgid "Entrance"
-msgstr "Giriş"
-
-#. item
-#: build/trans_presets.java:1019
-msgid "Edit Entrance"
-msgstr "Giriş düzenle"
-
-#. item "Barriers/Entrance" check "Motorcar"
+#.
 #. <separator/>
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1032 build/trans_presets.java:1075
+#: build/trans_presets.java:1018 build/trans_presets.java:1061
 msgid "Water"
 msgstr "Su"
 
 #. group "Water"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1019
 msgid "Spring"
 msgstr "Spring"
@@ -12164,5 +12045,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1021
 msgid "Edit Spring"
 msgstr "Spring Düzenle"
@@ -12170,5 +12051,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "kanalizasyon"
@@ -12176,10 +12057,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1028
 msgid "Edit Drain"
 msgstr "kanalizasyon düzenle"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1034
 msgid "Stream"
 msgstr "dere"
@@ -12187,10 +12068,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1036
 msgid "Edit Stream"
 msgstr "dere düzenle"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1042
 msgid "Canal"
 msgstr "Kanal"
@@ -12198,10 +12079,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1058
+#: build/trans_presets.java:1044
 msgid "Edit Canal"
 msgstr "Kanal düzenle"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1050
 msgid "River"
 msgstr "nehir"
@@ -12211,5 +12092,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:1068
+#: build/trans_presets.java:1054
 msgid "Edit River"
 msgstr "nehir düzenle"
@@ -12217,15 +12098,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1063
 msgid "Edit Water"
 msgstr "Su Düzenle"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1081
+#: build/trans_presets.java:1067
 msgid "Land"
 msgstr "Kara"
 
 #. item
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1068
 msgid "Edit Land"
 msgstr "Kara Düzenle"
@@ -12233,15 +12114,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1073
 msgid "Basin"
 msgstr "havza"
 
 #. item
-#: build/trans_presets.java:1088
+#: build/trans_presets.java:1074
 msgid "Edit Basin Landuse"
 msgstr "havza kullanım düzenle"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1079
 msgid "Reservoir"
 msgstr "Havuz"
@@ -12249,15 +12130,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1081
 msgid "Edit Reservoir Landuse"
 msgstr "Havuz Kullanımı Düzenle"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1086
 msgid "Covered Reservoir"
 msgstr "Kapalı Sarnıç"
 
 #. item
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1087
 msgid "Edit Covered Reservoir"
 msgstr "Kapalı Sarnıç Düzenle"
@@ -12265,5 +12146,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Nehirkenarı"
@@ -12272,10 +12153,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:1109
+#: build/trans_presets.java:1095
 msgid "Edit Riverbank"
 msgstr "Nehirkenarı Düzenle"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1113
+#: build/trans_presets.java:1099
 msgid "Wetland"
 msgstr "sulak alan"
@@ -12286,56 +12167,56 @@
 #. 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:1118
+#: build/trans_presets.java:1104
 msgid "Edit Wetland"
 msgstr "sulak alan düzenle"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "swamp"
 msgstr "bataklık"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "bog"
 msgstr "kenef"
 
-#. color wood
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
+#. color deprecated
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1121 build/trans_style.java:3068
+#: build/trans_presets.java:1107 build/trans_style.java:3326
 msgid "marsh"
 msgstr "batak"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "reedbed"
 msgstr "sazlık alan"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "saltmarsh"
 msgstr "çolak alan"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "tidalflat"
 msgstr "gelgit alanı"
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1107
 msgid "mangrove"
 msgstr "bataklık ormanı"
 
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1109
 msgid "Mud"
 msgstr "Çamur"
 
 #. item
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1110
 msgid "Edit Mud"
 msgstr "Çamur Alan Düzenle"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1114
 msgid "Beach"
 msgstr "Sahil"
@@ -12343,20 +12224,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1116
 msgid "Edit Beach"
 msgstr "Sahil Düzenle"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1134
+#: build/trans_presets.java:1120
 msgid "Bay"
 msgstr "Koy"
 
 #. item
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1121
 msgid "Edit Bay"
 msgstr "koy Düzenle"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1125
 msgid "Cliff"
 msgstr "Uçurum"
@@ -12364,10 +12245,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1141
+#: build/trans_presets.java:1127
 msgid "Edit Cliff"
 msgstr "Uçurum Düzenle"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1131
 msgid "Coastline"
 msgstr "Sahil Çizgisi"
@@ -12375,5 +12256,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1147
+#: build/trans_presets.java:1133
 msgid "Edit Coastline"
 msgstr "Sahil Çizgisi Düzenle"
@@ -12381,5 +12262,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "feribot hat"
@@ -12387,5 +12268,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1140
 msgid "Edit Ferry"
 msgstr "feribot hat düzenle"
@@ -12394,5 +12275,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Marina"
@@ -12400,10 +12281,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1164
+#: build/trans_presets.java:1150
 msgid "Edit Boatyard"
 msgstr "Marina düzenle"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1155
 msgid "Dock"
 msgstr "iskele"
@@ -12411,5 +12292,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1157
 msgid "Edit Dock"
 msgstr "iskele düzenle"
@@ -12417,5 +12298,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Baraj"
@@ -12423,15 +12304,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1165
 msgid "Edit Dam"
 msgstr "Baraj düzenle"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1171
 msgid "Waterway Point"
 msgstr "Su yolu noktası"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1172
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -12440,5 +12321,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1176
 msgid "Weir"
 msgstr "bent"
@@ -12446,20 +12327,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1178
 msgid "Edit Weir"
 msgstr "bent dünele"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1183
 msgid "Waterfall"
 msgstr "şelale"
 
 #. item
-#: build/trans_presets.java:1198
+#: build/trans_presets.java:1184
 msgid "Edit Waterfall"
 msgstr "şelale düzenle"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1189
 msgid "Turning Point"
 msgstr "dönüm noktası"
@@ -12468,15 +12349,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1193
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1194
 msgid "Edit Marina"
 msgstr "Marina düzenle"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1198
 msgid "Pier"
 msgstr "Kemer"
@@ -12484,10 +12365,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1214
+#: build/trans_presets.java:1200
 msgid "Edit Pier"
 msgstr "Kemer Düzenle"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1204
 msgid "Ferry Terminal"
 msgstr "Feribot Terminal"
@@ -12495,10 +12376,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1220
+#: build/trans_presets.java:1206
 msgid "Edit Ferry Terminal"
 msgstr "Feribot Terminal düzenle"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1224
+#: build/trans_presets.java:1210
 msgid "Slipway"
 msgstr "Gemi Kızağı"
@@ -12508,5 +12389,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:1228
+#: build/trans_presets.java:1214
 msgid "Edit Slipway"
 msgstr "Gemi Kızağı Düzenle"
@@ -12514,10 +12395,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1220
 msgid "Railway"
 msgstr "Demiryolu"
 
 #. group "Railway"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1221
 msgid "Rail"
 msgstr "Demiryolu"
@@ -12525,5 +12406,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1223
 msgid "Edit Rail"
 msgstr "Demiryolu düzenle"
@@ -12553,8 +12434,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "Optional Types"
 msgstr "seçmeli tipler"
@@ -12568,35 +12449,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "yard"
 msgstr "saha"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "siding"
 msgstr "yük boşaltma yeri"
 
-#: build/trans_presets.java:1240 build/trans_presets.java:1246
-#: build/trans_presets.java:1253 build/trans_presets.java:1259
-#: build/trans_presets.java:1265 build/trans_presets.java:1271
-#: build/trans_presets.java:1277 build/trans_presets.java:1302
+#: build/trans_presets.java:1226 build/trans_presets.java:1232
+#: build/trans_presets.java:1239 build/trans_presets.java:1245
+#: build/trans_presets.java:1251 build/trans_presets.java:1257
+#: build/trans_presets.java:1263 build/trans_presets.java:1288
 msgid "spur"
 msgstr "demiryolu hattı şube-kısa"
 
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1228
 msgid "Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu"
 
 #. item
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1229
 msgid "Edit Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu düzenle"
 
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1234
 msgid "Monorail"
 msgstr "tek ray"
@@ -12604,45 +12485,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1236
 msgid "Edit Monorail"
 msgstr "tek ray düzenle"
 
-#: build/trans_presets.java:1255
+#: build/trans_presets.java:1241
 msgid "Preserved"
 msgstr "Korunmuş"
 
 #. item
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1242
 msgid "Edit Preserved Railway"
 msgstr "Korunmuş demiryolu düzenle"
 
-#: build/trans_presets.java:1261
+#: build/trans_presets.java:1247
 msgid "Light Rail"
 msgstr "Hafif Ray"
 
 #. item
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1248
 msgid "Edit Light Rail"
 msgstr "Hafif Ray Düzenle"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1253
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1254
 msgid "Edit Subway"
 msgstr "Metro Düzenle"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1259
 msgid "Tram"
 msgstr "Tramvay"
 
 #. item
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1260
 msgid "Edit Tram"
 msgstr "Tramvay Düzenle"
 
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1265
 msgid "Bus Guideway"
 msgstr "Otobüs Yolu"
@@ -12650,5 +12531,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1267
 msgid "Edit Bus Guideway"
 msgstr "Otobüs Yolu Düzenle"
@@ -12657,14 +12538,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1284
 msgid "Disused Rail"
 msgstr "Kullanılmayan Demiryolu"
 
 #. item
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1285
 msgid "Edit Disused Railway"
 msgstr "Kullanılmayan Demiryolu Düzenle"
 
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1290
 msgid "Abandoned Rail"
 msgstr "Terkedilmiş demiryolu düzenle"
@@ -12673,5 +12554,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "hemzemin geçit"
@@ -12680,5 +12561,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1298
 msgid "Crossing"
 msgstr "geçit"
@@ -12688,5 +12569,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr ""
@@ -12694,5 +12575,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "döner levha"
@@ -12701,10 +12582,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:1313
 msgid "Aerialway"
 msgstr "havayolu"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1314
 msgid "Chair Lift"
 msgstr "Teleski"
@@ -12712,10 +12593,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1316
 msgid "Edit Chair Lift"
 msgstr "Teleski Düzenle"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1320
 msgid "Drag Lift"
 msgstr "Kayakçı Asansörü"
@@ -12723,10 +12604,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1322
 msgid "Edit Drag Lift"
 msgstr "Kayakçı Asansörü Düzenle"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1326
 msgid "Cable Car"
 msgstr "Hava tramvayı"
@@ -12734,24 +12615,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1328
 msgid "Edit Cable Car"
 msgstr "Hava tramvayı düzenle"
 
 #. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1332
+msgid "Gondola"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1334
+#, fuzzy
+msgid "Edit Gondola"
+msgstr "Golf Düzenle"
+
+#. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1346 build/trans_presets.java:1433
+#: build/trans_presets.java:1338 build/trans_presets.java:1426
 msgid "Station"
 msgstr "İstasyon"
 
 #. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
 #. item
 #. <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:1347 build/trans_presets.java:1436
+#: build/trans_presets.java:1340 build/trans_presets.java:1429
 msgid "Edit Station"
 msgstr "İstasyon Düzenle"
 
 #. group "Car"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "Fuel"
 msgstr "Yakıt"
@@ -12761,5 +12655,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:1358
+#: build/trans_presets.java:1351
 msgid "Edit Fuel"
 msgstr "Yakıt düzenle"
@@ -12775,5 +12669,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1363 build/trans_presets.java:1410
+#: build/trans_presets.java:1356 build/trans_presets.java:1403
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -12783,5 +12677,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:1366
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Park düzenle"
@@ -12789,40 +12683,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1369 build/trans_presets.java:1415
+#: build/trans_presets.java:1362 build/trans_presets.java:1408
 msgid "Capacity"
 msgstr "kapasite"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "yüzey"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "kat otoparkı"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "underground"
 msgstr "yer altı"
 
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "park_and_ride"
 msgstr "park_ve_sür"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Disabled"
 msgstr "Özürlü Alanı"
 
-#: build/trans_presets.java:1372
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1365 build/trans_presets.java:2304
 msgid "Fee"
 msgstr "Ücret"
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1367
 msgid "Wash"
 msgstr "Yıkama"
 
 #. item
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Edit Car Wash"
 msgstr "Yıkama düzenle"
@@ -12830,5 +12725,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1380 build/trans_presets.java:1424
+#: build/trans_presets.java:1373 build/trans_presets.java:1417
 msgid "Shop"
 msgstr "Alışveriş"
@@ -12836,15 +12731,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Shop"
 msgstr "araçlı alışveriş düzenle"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1380
 msgid "Repair"
 msgstr "tamirci"
 
 #. item
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1381
 msgid "Edit Car Repair"
 msgstr "tamirci düzenle"
@@ -12852,5 +12747,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1393 build/trans_presets.java:1417
+#: build/trans_presets.java:1386 build/trans_presets.java:1410
 msgid "Rental"
 msgstr "araç kiralam"
@@ -12859,10 +12754,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:1396
+#: build/trans_presets.java:1389
 msgid "Edit Car Rental"
 msgstr "araç kiralam düzenle"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1394
 msgid "Sharing"
 msgstr "Paylaşım Alanı"
@@ -12870,5 +12765,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1396
 msgid "Edit Car Sharing"
 msgstr "Araç Paylaşım alanı düzenle"
@@ -12876,5 +12771,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1412
+#: build/trans_presets.java:1405
 msgid "Edit Bicycle Parking"
 msgstr "Bisiklet parkyeri düzenle"
@@ -12883,5 +12778,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:1420
+#: build/trans_presets.java:1413
 msgid "Edit Bicycle Rental"
 msgstr "bisiklet kiralama düzenle"
@@ -12890,15 +12785,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:1427
+#: build/trans_presets.java:1420
 msgid "Edit Bicycle Shop"
 msgstr "Bisiklet dükkanı düzenle"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1425
 msgid "Public Transport"
 msgstr "Toplu taşıma"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1441
+#: build/trans_presets.java:1434
 msgid "UIC-Reference"
 msgstr "UIC-Referans"
@@ -12906,5 +12801,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1437
 msgid "Railway Halt"
 msgstr "Demiryolu sonu"
@@ -12912,5 +12807,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1439
 msgid "Edit Halt"
 msgstr "Son nokta düzenle"
@@ -12918,5 +12813,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Tram Stop"
 msgstr "Tramvay durağı"
@@ -12925,5 +12820,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:1456
+#: build/trans_presets.java:1449
 msgid "Edit Tram Stop"
 msgstr "tramvay durağı düzenle"
@@ -12931,5 +12826,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Railway Platform"
 msgstr "Demiryolu platformu"
@@ -12938,5 +12833,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:1466
+#: build/trans_presets.java:1459
 msgid "Edit Railway Platform"
 msgstr "Demiryolu platformu düzenle"
@@ -12948,5 +12843,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1469 build/trans_presets.java:1510
+#: build/trans_presets.java:1462 build/trans_presets.java:1503
 msgid "Reference (track number)"
 msgstr "referans (iz numarası)"
@@ -12954,10 +12849,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1471 build/trans_presets.java:1512
+#: build/trans_presets.java:1464 build/trans_presets.java:1505
 msgid "Area"
 msgstr "Alan"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Subway Entrance"
 msgstr "Metro Girişi"
@@ -12966,10 +12861,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:1476
+#: build/trans_presets.java:1469
 msgid "Edit Subway Entrance"
 msgstr "Metro Girişi Düzenle"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1474
 msgid "Wheelchair"
 msgstr "tekerlekli sandalye"
@@ -12978,5 +12873,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "otogar"
@@ -12985,5 +12880,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:1489
+#: build/trans_presets.java:1482
 msgid "Edit Bus Station"
 msgstr "otogar düzenle"
@@ -12991,5 +12886,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1488
 msgid "Bus Stop"
 msgstr "otobüs durağı"
@@ -12999,5 +12894,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:1499
+#: build/trans_presets.java:1492
 msgid "Edit Bus Stop"
 msgstr "otobüs durağı düzenle"
@@ -13005,10 +12900,10 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Bus Platform"
 msgstr "otobüs platformu"
 
 #. item
-#: build/trans_presets.java:1507
+#: build/trans_presets.java:1500
 msgid "Edit Bus Platform"
 msgstr "otobüs platformu düzenle"
@@ -13016,5 +12911,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taksi"
@@ -13022,5 +12917,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Taxi station"
 msgstr "taksi istasyonu düzenle"
@@ -13028,5 +12923,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Havaalanı"
@@ -13034,15 +12929,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1517
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1529
+#: build/trans_presets.java:1522
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1523
 msgid "ICAO"
 msgstr "ICAO"
@@ -13051,5 +12946,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Kalınacak Yerler"
@@ -13061,5 +12956,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1536 build/trans_surveyor.java:43
+#: build/trans_presets.java:1529 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -13068,15 +12963,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:1539
+#: build/trans_presets.java:1532
 msgid "Edit Hotel"
 msgstr "Hotel Düzenle"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Motel"
 msgstr "Motel"
@@ -13084,20 +12979,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1539
 msgid "Edit Motel"
 msgstr "Motel Düzenle"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1543
 msgid "Guest House"
 msgstr "Misafir Evi"
 
 #. item
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1544
 msgid "Edit Guest House"
 msgstr "Misafir Evi Düzenle"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1548
 msgid "Chalet"
 msgstr "kulübe"
@@ -13105,10 +13000,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1550
 msgid "Edit Chalet"
 msgstr "külübe düzenle"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1554
 msgid "Hostel"
 msgstr "Hostel"
@@ -13116,30 +13011,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1556
 msgid "Edit Hostel"
 msgstr "Hostel Düzenle"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1560
 msgid "Alpine Hut"
 msgstr "Dağcı Barakası"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1561
 msgid "Edit Alpine Hut"
 msgstr "Dağcı Barakası Düzenle"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Caravan Site"
 msgstr "Karavan Alanı"
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1567
 msgid "Edit Caravan Site"
 msgstr "Karavan Alanı Düzenle"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1571
 msgid "Camping Site"
 msgstr "Kamp Sitesi"
@@ -13147,10 +13042,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1573
 msgid "Edit Camping Site"
 msgstr "Kamp Sitesi Düzenle"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Food+Drinks"
 msgstr "Yüyecek+içecek"
@@ -13161,5 +13056,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1586 build/trans_surveyor.java:47
+#: build/trans_presets.java:1579 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -13167,5 +13062,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1581
 msgid "Edit Restaurant"
 msgstr "Restorant Düzenle"
@@ -13173,5 +13068,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "Cuisine"
 msgstr "lokanta"
@@ -13179,61 +13074,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "italian"
 msgstr "italyan"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "chinese"
 msgstr "çinli"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "greek"
 msgstr "yunan"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "german"
 msgstr "alman"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "indian"
 msgstr "hint"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "regional"
 msgstr "yöresel"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "turkish"
 msgstr "türk"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "asian"
 msgstr "asyalı"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1591 build/trans_presets.java:1598
+#: build/trans_presets.java:1584 build/trans_presets.java:1591
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -13241,9 +13136,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast Food düzenle"
 
-#: build/trans_presets.java:1600
+#: build/trans_presets.java:1593
 msgid "Cafe"
 msgstr "Kafe"
@@ -13251,10 +13146,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Cafe"
 msgstr "Cafe düzenle"
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Pub"
 msgstr "Pub"
@@ -13262,20 +13157,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Pub"
 msgstr "Pub Düzenle"
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1606
 msgid "Edit Biergarten"
 msgstr "Biergarten Düzenle"
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1610
 msgid "Bar"
 msgstr ""
@@ -13283,10 +13178,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1616
 msgid "Nightclub"
 msgstr "GeceKlubu"
@@ -13294,20 +13189,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Nightclub"
 msgstr "GeceKulubu Düzenle"
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1623
 msgid "Tourism"
 msgstr "Turizm"
 
 #. group "Tourism"
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Attraction"
 msgstr "İlginç Yerler"
 
 #. item
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1625
 msgid "Edit Attraction"
 msgstr "İlginç Yerler Düzenle"
@@ -13316,22 +13211,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:1628 build/trans_presets.java:1668
+#: build/trans_presets.java:2368
 msgid "Opening Hours"
 msgstr "Açılış saati"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1637
-msgid "Information Office"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1639
-msgid "Edit Information Office"
-msgstr ""
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1630
 msgid "Museum"
 msgstr "Müse"
@@ -13339,10 +13223,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1632
 msgid "Edit Museum"
 msgstr "Müze Düzenle"
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1636
 msgid "Zoo"
 msgstr "Hayvanat Bahçesi"
@@ -13351,10 +13235,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:1654
+#: build/trans_presets.java:1639
 msgid "Edit Zoo"
 msgstr "Hayvanat Bahçesi Düzenle"
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1643
 msgid "Viewpoint"
 msgstr "Seyir Yeri"
@@ -13362,25 +13246,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1645
 msgid "Edit Viewpoint"
 msgstr "Seyir Yeri Düzenle"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1648
 msgid "Look-Out Tower"
 msgstr "Seyir Kulesi"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1665
+#: build/trans_presets.java:1650
 msgid "Theme Park"
 msgstr "Lunapark"
 
 #. item
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1651
 msgid "Edit Theme Park"
 msgstr "Lunapark Düzenle"
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1655
 msgid "Artwork"
 msgstr "Sanatsal"
@@ -13388,5 +13272,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1657
 msgid "Edit Artwork"
 msgstr "Sanatsal Düzenle"
@@ -13394,77 +13278,89 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1677
-msgid "Guidepost (Hiking)"
+#: build/trans_presets.java:1662
+msgid "Information Office"
+msgstr ""
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#: build/trans_presets.java:1664
+msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "map"
 msgstr "harita"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "citymap"
 msgstr "şehir haritası"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "hikingmap"
 msgstr "gezirehberi"
 
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1674
 msgid "bicyclemap"
 msgstr "bisikletharitası"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1687 build/trans_presets.java:1694
-#: build/trans_presets.java:1700
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1695
 msgid "Closer Description"
 msgstr ""
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1677
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "Board Type"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "board"
 msgstr "yiyecek noktası"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "history"
 msgstr "tarih"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "nature"
 msgstr "doğa"
 
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1681
 msgid "wildlife"
 msgstr "vahşiyaşam"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1684
+msgid "Guidepost (Hiking)"
+msgstr ""
+
+#. item "Tourism/Guidepost (Hiking)" text "Elevation"
+#: build/trans_presets.java:1691
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1702 build/trans_presets.java:2347
+#: build/trans_presets.java:1698 build/trans_presets.java:2344
 msgid "Shelter"
 msgstr "Sığınak"
 
 #. item
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1699
 msgid "Edit Shelter"
 msgstr "Sığınak Düzenle"
@@ -13472,25 +13368,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1706 build/trans_presets.java:1712
+#: build/trans_presets.java:1702 build/trans_presets.java:1708
 msgid "Fireplace"
 msgstr "Mangal Alanı"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1704
 msgid "Picnic Site"
 msgstr "Piknik Alanı"
 
 #. item
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1705
 msgid "Edit Picnic Site"
 msgstr "Piknik Alanı Düzenle"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1711
 msgid "Historic Places"
 msgstr "Tarihi Alanlar"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1712
 msgid "Castle"
 msgstr "Kale"
@@ -13499,20 +13395,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:1719
+#: build/trans_presets.java:1715
 msgid "Edit Castle"
 msgstr "Kale Düzenle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1719
 msgid "Ruins"
 msgstr "Harabe"
 
 #. item
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1720
 msgid "Edit Ruins"
 msgstr "Harabe Düzenle"
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1724
 msgid "Archaeological Site"
 msgstr "Arkeolojik Site"
@@ -13521,20 +13417,32 @@
 #. <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:1731
+#: build/trans_presets.java:1727
 msgid "Edit Archaeological Site"
 msgstr "Arkeolojik Site Düzenle"
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1731
+msgid "Battlefield"
+msgstr "Savaş Alanı"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1733
+msgid "Edit Battlefield"
+msgstr "Savaş Alanı Düzenle"
+
+#. item "Historic Places/Battlefield" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1738
 msgid "Monument"
 msgstr "Anıt"
 
 #. item
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1739
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1743
 msgid "Memorial"
 msgstr "Abide"
@@ -13542,56 +13450,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1745
 msgid "Edit Memorial"
 msgstr "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1746
-msgid "Battlefield"
-msgstr "Savaş Alanı"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1748
-msgid "Edit Battlefield"
-msgstr "Savaş Alanı Düzenle"
-
-#. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1749
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item
-#: build/trans_presets.java:1753
+#: build/trans_presets.java:1750
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1754
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1755
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1760
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1761
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1762
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1766
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -13599,15 +13496,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1771
+#: build/trans_presets.java:1768
 msgid "Edit Playground"
 msgstr "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1772
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1773
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
@@ -13615,15 +13512,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1779
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1780
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1781
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -13637,6 +13534,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1788 build/trans_presets.java:1797
-#: build/trans_presets.java:1806 build/trans_presets.java:1815
+#: build/trans_presets.java:1785 build/trans_presets.java:1794
+#: build/trans_presets.java:1803 build/trans_presets.java:1812
 msgid "select sport:"
 msgstr "Spor Seç"
@@ -13715,4 +13612,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="climbing"/>
 #. color sport
@@ -14004,28 +13909,29 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
-#: build/trans_style.java:3248 build/trans_style.java:3256
-#: build/trans_style.java:3264 build/trans_style.java:3272
-#: build/trans_style.java:3280 build/trans_style.java:3288
-#: build/trans_style.java:3296 build/trans_style.java:3304
-#: build/trans_style.java:3312 build/trans_style.java:3320
-#: build/trans_style.java:3328 build/trans_style.java:3336
-#: build/trans_style.java:3344 build/trans_style.java:3352
-#: build/trans_style.java:3360 build/trans_style.java:3368
-#: build/trans_style.java:3376 build/trans_style.java:3384
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408 build/trans_style.java:3416
-#: 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:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
-#: build/trans_style.java:3520 build/trans_style.java:3528
-#: build/trans_style.java:3536 build/trans_style.java:3544
-#: build/trans_style.java:3552 build/trans_style.java:3560
-#: build/trans_style.java:3568 build/trans_style.java:3576
-#: build/trans_style.java:3584 build/trans_style.java:3592
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570 build/trans_style.java:3578
+#: build/trans_style.java:3586 build/trans_style.java:3594
+#: build/trans_style.java:3602 build/trans_style.java:3610
+#: build/trans_style.java:3618 build/trans_style.java:3626
+#: build/trans_style.java:3634 build/trans_style.java:3642
+#: build/trans_style.java:3650 build/trans_style.java:3658
+#: build/trans_style.java:3666 build/trans_style.java:3674
+#: build/trans_style.java:3682 build/trans_style.java:3690
+#: build/trans_style.java:3698 build/trans_style.java:3706
+#: build/trans_style.java:3714 build/trans_style.java:3722
+#: build/trans_style.java:3730 build/trans_style.java:3738
+#: build/trans_style.java:3746 build/trans_style.java:3754
+#: build/trans_style.java:3762 build/trans_style.java:3770
+#: build/trans_style.java:3778 build/trans_style.java:3786
+#: build/trans_style.java:3794 build/trans_style.java:3802
+#: build/trans_style.java:3810 build/trans_style.java:3818
+#: build/trans_style.java:3826 build/trans_style.java:3834
+#: build/trans_style.java:3842 build/trans_style.java:3850
+#: build/trans_style.java:3858
 msgid "sport"
 msgstr "spor"
@@ -14035,227 +13941,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "multi"
 msgstr "çoğul"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "archery"
 msgstr "okçuluk"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "australian_football"
 msgstr "avustralya_footbol"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "baseball"
 msgstr "basebol"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "basketball"
 msgstr "basketbol"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "boules"
 msgstr "bowling"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "bowls"
 msgstr "çimen bowling"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "climbing"
 msgstr "tırmanma"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "cycling"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "dog_racing"
 msgstr "köpek yarışı"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "equestrian"
 msgstr "at binicilik"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "football"
 msgstr "futbol"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "gymnastics"
 msgstr "jimnastik"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "hockey"
 msgstr "hokey"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "horse_racing"
 msgstr "at_yarışı"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "racquet"
 msgstr "raket"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "shooting"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skateboard"
 msgstr "kaykay"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skating"
 msgstr "paten"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "skiing"
 msgstr "kaymak"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "soccer"
 msgstr "futbol"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "swimming"
 msgstr "yüzmek"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "table_tennis"
 msgstr "masa_tenisi"
 
-#: build/trans_presets.java:1790 build/trans_presets.java:1799
-#: build/trans_presets.java:1808 build/trans_presets.java:1817
+#: build/trans_presets.java:1787 build/trans_presets.java:1796
+#: build/trans_presets.java:1805 build/trans_presets.java:1814
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1789
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1790
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1798
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1799
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1807
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1808
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:1819
+#: build/trans_presets.java:1816
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1817
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1821
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item
-#: build/trans_presets.java:1825
+#: build/trans_presets.java:1822
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1827
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1828
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1829
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
@@ -14294,191 +14200,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "pitch"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "sports_centre"
 msgstr "spor_merkezi"
 
-#: build/trans_presets.java:1835 build/trans_presets.java:1841
-#: build/trans_presets.java:1847 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1865
-#: build/trans_presets.java:1871 build/trans_presets.java:1877
-#: build/trans_presets.java:1883 build/trans_presets.java:1889
-#: build/trans_presets.java:1895 build/trans_presets.java:1901
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2039
+#: build/trans_presets.java:1832 build/trans_presets.java:1838
+#: 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:1925
+#: build/trans_presets.java:1932 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 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
 msgid "stadium"
 msgstr "stadyum"
 
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1834
 msgid "10pin"
 msgstr "10pin"
 
 #. item
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1835
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1840
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1841
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1846
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1847
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1852
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1853
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1858
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1859
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1864
 msgid "Cycling"
 msgstr "Bisiklet"
 
 #. item
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1865
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:1873
+#: build/trans_presets.java:1870
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:1871
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1876
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:1877
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:1885
+#: build/trans_presets.java:1882
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1883
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1888
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:1889
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1894
 msgid "Motor Sports"
 msgstr "Motor Sporlar"
 
 #. item
-#: build/trans_presets.java:1898
+#: build/trans_presets.java:1895
 msgid "Edit Motor Sports"
 msgstr "Motor Sporları Düzenle"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1900
 msgid "Skating"
 msgstr "patinaj"
 
 #. item
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1901
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1906
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:1907
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1912
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:1913
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1918
 msgid "Skiing"
 msgstr "Kayak"
@@ -14486,56 +14392,58 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1920
 msgid "Edit Skiing"
 msgstr "Kayak Düzenle"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1923
 msgid "snow_park"
 msgstr ""
 
+#: build/trans_presets.java:1924
+msgid "Difficulty"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:1924
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "intermediate"
+msgstr "orta_meydan"
+
+#: build/trans_presets.java:1924
+#, fuzzy
+msgid "advanced"
+msgstr "büyük_meydan"
+
+#: build/trans_presets.java:1924
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:1924
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:1927
-msgid "Difficulty"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1927
-msgid "novice"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "easy"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "intermedia"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "advance"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:1927
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:1930
 msgid "Shooting"
 msgstr "Atıcılık"
@@ -14543,178 +14451,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1929
 msgid "Edit Shooting"
 msgstr "Atıcılık Düzenle"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1935
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1936
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1937
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1942
 msgid "Football"
 msgstr "Amerikan Futbolu"
 
 #. item
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1943
 msgid "Edit Football"
 msgstr "Amerikan Futbolu Düzenle"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:1948
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1949
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1954
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1955
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1960
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1961
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: build/trans_presets.java:1969
+#: build/trans_presets.java:1966
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1967
 msgid "Edit Golf"
 msgstr "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1970
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:1975
+#: build/trans_presets.java:1972
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1973
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:1981
+#: build/trans_presets.java:1978
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1979
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:1987
+#: build/trans_presets.java:1984
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1985
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1990
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1991
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:1996
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1997
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2002
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2003
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2008
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2009
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:2017
+#: build/trans_presets.java:2014
 msgid "Racquet"
 msgstr "Raket"
 
 #. item
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2015
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2020
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2021
 msgid "Edit Rugby"
 msgstr "Rugby Düzenle"
 
-#: build/trans_presets.java:2029
+#: build/trans_presets.java:2026
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2027
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2032
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2033
 msgid "Edit Tennis"
 msgstr "Tennis Düzenle"
 
 #. <separator/>
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2040
 msgid "Buildings"
 msgstr "Binalar"
 
 #. group "Buildings"
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2041
 msgid "Building"
 msgstr "Bina"
@@ -14722,5 +14630,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -14728,10 +14636,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2046
 msgid "Edit Public Building"
 msgstr "Kamu Binası Düzenle"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2050
 msgid "Town hall"
 msgstr "belediye binası"
@@ -14739,10 +14647,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2052
 msgid "Edit Town hall"
 msgstr "belediye binası düzenle"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2056
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -14750,10 +14658,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2058
 msgid "Edit Embassy"
 msgstr "Büyükelçilik Düzenle"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2062
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -14762,10 +14670,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:2068
+#: build/trans_presets.java:2065
 msgid "Edit Courthouse"
 msgstr "adliye sarayı düzenle"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2069
 msgid "Prison"
 msgstr "Hapishane"
@@ -14774,10 +14682,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:2075
+#: build/trans_presets.java:2072
 msgid "Edit Prison"
 msgstr "Hapishane Düzenle"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2076
 msgid "Police"
 msgstr "Polis"
@@ -14787,10 +14695,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:2083
+#: build/trans_presets.java:2080
 msgid "Edit Police"
 msgstr "Polis Düzenle"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2084
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -14799,10 +14707,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:2090
+#: build/trans_presets.java:2087
 msgid "Edit Fire Station"
 msgstr "İtfaye İstasyonu Düzenle"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2091
 msgid "Post Office"
 msgstr "Postane"
@@ -14810,5 +14718,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2093
 msgid "Edit Post Office"
 msgstr "Postane Düzenle"
@@ -14816,15 +14724,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2098
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2099
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2103
 msgid "School"
 msgstr "Okul"
@@ -14832,10 +14740,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2105
 msgid "Edit School"
 msgstr "okul düzenle"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2109
 msgid "University"
 msgstr "Universite"
@@ -14843,10 +14751,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2111
 msgid "Edit University"
 msgstr "Universite Düzenle"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2115
 msgid "College"
 msgstr "kolej"
@@ -14854,5 +14762,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2117
 msgid "Edit College"
 msgstr "kolej düzenle"
@@ -14860,5 +14768,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Sinema"
@@ -14867,10 +14775,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:2128
+#: build/trans_presets.java:2125
 msgid "Edit Cinema"
 msgstr "Sinema Düzenle"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2129
 msgid "Library"
 msgstr "kütüphane"
@@ -14879,10 +14787,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:2135
+#: build/trans_presets.java:2132
 msgid "Edit Library"
 msgstr "kütüphane düzenle"
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2136
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -14890,10 +14798,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2138
 msgid "Edit Arts Centre"
 msgstr "sanat merkezi düzenle"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2142
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -14902,10 +14810,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:2148
+#: build/trans_presets.java:2145
 msgid "Edit Theatre"
 msgstr "Tiyatro Düzenle"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2149
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -14915,5 +14823,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:2156
+#: build/trans_presets.java:2153
 msgid "Edit Place of Worship"
 msgstr "Tapınak Düzenle"
@@ -14922,6 +14830,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "Religion"
 msgstr "Din"
@@ -14930,66 +14838,67 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "christian"
 msgstr "hristiyan"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "jewish"
 msgstr "yahudi"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "muslim"
 msgstr "müslüman"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
-msgid "unitarianist"
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
+#, fuzzy
+msgid "unitarian"
 msgstr "unitarianist"
 
-#: build/trans_presets.java:2159 build/trans_presets.java:2847
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2156 build/trans_presets.java:2877
+#: build/trans_presets.java:2886
 msgid "zoroastrian"
 msgstr "Zerdüştlük"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "Denomination"
 msgstr "mezhep"
@@ -14998,81 +14907,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "anglican"
 msgstr "anglikan"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "catholic"
 msgstr "katholik"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "evangelical"
 msgstr "protestan"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "jehovahs_witness"
 msgstr "yahova_şahitleri"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2160 build/trans_presets.java:2848
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2157 build/trans_presets.java:2878
+#: build/trans_presets.java:2887
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2160
 msgid "Addresses"
 msgstr "Adres"
@@ -15081,5 +14990,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:2166
+#: build/trans_presets.java:2163
 msgid "Edit Address Information"
 msgstr "Adres Bilgileri Düzenle"
@@ -15087,5 +14996,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2165
 msgid "House number"
 msgstr "Ev no:"
@@ -15093,20 +15002,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2167
 msgid "House name"
 msgstr "Ev İsmi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2169
 msgid "City name"
 msgstr "Şehir Adı"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2170
 msgid "Post code"
 msgstr "Posta Kodu"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2171
 msgid "Country code"
 msgstr "Ülke Kodu"
@@ -15114,5 +15023,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -15121,5 +15030,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:2180
+#: build/trans_presets.java:2177
 msgid "Edit Address Interpolation"
 msgstr "Adres İnterpolasyon Düzenle"
@@ -15127,67 +15036,72 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "Numbering scheme"
 msgstr "Numara şeması"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "odd"
 msgstr "tek"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "even"
 msgstr "çift"
 
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2179
 msgid "all"
 msgstr "hepsi"
 
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2179
+#, fuzzy
+msgid "alphabetic"
+msgstr "atletik"
+
+#: build/trans_presets.java:2182
 msgid "Man Made"
 msgstr "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2183
 msgid "Works"
 msgstr "Tesis"
 
 #. item
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2184
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2188
 msgid "Tower"
 msgstr "Kule"
 
 #. item
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2189
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2193
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2194
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2198
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2199
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2203
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -15195,10 +15109,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2205
 msgid "Edit Lighthouse"
 msgstr "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2209
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -15206,10 +15120,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2214
+#: build/trans_presets.java:2211
 msgid "Edit Windmill"
 msgstr "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2215
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -15217,10 +15131,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2217
 msgid "Edit Pipeline"
 msgstr "Suboru hattı Düzenle"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2221
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -15230,10 +15144,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:2228
+#: build/trans_presets.java:2225
 msgid "Edit Wastewater Plant"
 msgstr "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2229
 msgid "Crane"
 msgstr "Vinç"
@@ -15241,10 +15155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2231
 msgid "Edit Crane"
 msgstr "Vinç Düzenle"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2235
 msgid "Beacon"
 msgstr "Fener"
@@ -15252,10 +15166,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2237
 msgid "Edit Beacon"
 msgstr "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2241
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -15263,10 +15177,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2243
 msgid "Edit Survey Point"
 msgstr "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2247
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -15274,5 +15188,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2249
 msgid "Edit Surveillance Camera"
 msgstr "Gözetim Kamera Düzenle"
@@ -15280,5 +15194,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -15288,39 +15202,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:2261
+#: build/trans_presets.java:2258
 msgid "Edit Power Generator"
 msgstr "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2260
 msgid "gas"
 msgstr "benzin"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2263
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -15329,10 +15243,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:2269
+#: build/trans_presets.java:2266
 msgid "Edit Power Station"
 msgstr "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2270
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -15341,5 +15255,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:2276
+#: build/trans_presets.java:2273
 msgid "Edit Power Sub Station"
 msgstr "Alt Güç İstasyonu Düzenle"
@@ -15347,10 +15261,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2279 build/trans_presets.java:2295
+#: build/trans_presets.java:2276 build/trans_presets.java:2292
 msgid "Line reference"
 msgstr "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2278
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -15361,5 +15275,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:2286
+#: build/trans_presets.java:2283
 msgid "Edit Power Tower"
 msgstr "güç Kulesi Düzenle"
@@ -15367,5 +15281,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2286
 msgid "Power Line"
 msgstr "Güç Hattı"
@@ -15374,25 +15288,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:2292
+#: build/trans_presets.java:2289
 msgid "Edit Power Line"
 msgstr "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2293
 msgid "Voltage"
 msgstr "Voltaj"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2294
 msgid "Amount of Wires"
 msgstr "Kablo Miktarı"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2297
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2298
 msgid "Toilets"
 msgstr "Tuvalet"
@@ -15400,25 +15314,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2306 build/trans_presets.java:2398
+#: build/trans_presets.java:2303 build/trans_presets.java:2395
 msgid "Reference number"
 msgstr "Referans Numarası"
 
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:2307
-msgid "Charge"
-msgstr "Para Değişim"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2308 build/trans_presets.java:2399
+#: build/trans_presets.java:2305 build/trans_presets.java:2396
 msgid "Note"
 msgstr "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2307
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2312
 msgid "Telephone"
 msgstr "Telefon"
@@ -15427,5 +15336,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:2318
+#: build/trans_presets.java:2315
 msgid "Edit Telephone"
 msgstr "Telefon Düzenle"
@@ -15433,5 +15342,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2321 build/trans_presets.java:2400
+#: build/trans_presets.java:2318 build/trans_presets.java:2397
 msgid "Coins"
 msgstr "Madeni Para"
@@ -15439,5 +15348,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2322 build/trans_presets.java:2401
+#: build/trans_presets.java:2319 build/trans_presets.java:2398
 msgid "Notes"
 msgstr "Notlar"
@@ -15445,5 +15354,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2323 build/trans_presets.java:2402
+#: build/trans_presets.java:2320 build/trans_presets.java:2399
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronik cüzdan ve Para Değişim Kartları"
@@ -15451,5 +15360,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2324 build/trans_presets.java:2403
+#: build/trans_presets.java:2321 build/trans_presets.java:2400
 msgid "Debit cards"
 msgstr "ATM kartı"
@@ -15457,15 +15366,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2325 build/trans_presets.java:2404
+#: build/trans_presets.java:2322 build/trans_presets.java:2401
 msgid "Credit cards"
 msgstr "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2323
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2325
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -15474,5 +15383,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:2331
+#: build/trans_presets.java:2328
 msgid "Edit Recycling station"
 msgstr "Geri Dönüşüm İstasyonu"
@@ -15480,35 +15389,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2330
 msgid "Batteries"
 msgstr "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2331
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2332
 msgid "Clothes"
 msgstr "Kıyafet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2333
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2334
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2335
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2337
 msgid "Bench"
 msgstr "banket"
@@ -15517,20 +15426,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2341
 msgid "Hunting Stand"
 msgstr "Av Standı"
 
 #. item
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2342
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2345
 msgid "Hide"
 msgstr "Sakla"
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2346
 msgid "Lock"
 msgstr "Kilitle"
@@ -15538,22 +15447,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2350 build/trans_presets.java:2742
+#: build/trans_presets.java:2347 build/trans_presets.java:2747
 msgid "Height"
 msgstr "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2347
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2349
 msgid "Fountain"
 msgstr "Kaynak"
@@ -15562,10 +15471,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:2355
+#: build/trans_presets.java:2352
 msgid "Edit Fountain"
 msgstr "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2356
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -15574,10 +15483,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:2362
+#: build/trans_presets.java:2359
 msgid "Edit Drinking Water"
 msgstr "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2363
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
@@ -15585,25 +15494,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2365
 msgid "Edit Baby Hatch"
 msgstr "Bebek Yuvası Düzenle"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2371
 msgid "Shops"
 msgstr "Dükkanlar"
 
 #. group "Shops"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2372
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2373
 msgid "Edit Supermarket"
 msgstr "Supermarket Düzenle"
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2377
 msgid "Convenience Store"
 msgstr "Bakkal"
@@ -15611,10 +15520,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2379
 msgid "Edit Convenience Store"
 msgstr "Bakkal Düzenle"
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2383
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -15622,10 +15531,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2385
 msgid "Edit Kiosk"
 msgstr "Kiosk Düzenle"
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2389
 msgid "Vending machine"
 msgstr "Kahve Makinası"
@@ -15633,5 +15542,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2391
 msgid "Edit Vending machine"
 msgstr "Kahve Makinası Düzenle"
@@ -15639,88 +15548,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "Vending products"
 msgstr "Ücretli Ürünler"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_tickets"
 msgstr "toplu_taşıma_bileti"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "public_transport_plans"
 msgstr "toplu_taşıma_hatları"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "parking_tickets"
 msgstr "Park_bileti"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "food"
 msgstr "yiyecek"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "drinks"
 msgstr "içecek"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "sweets"
 msgstr "tatlı"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "cigarettes"
 msgstr "sigara"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "photos"
 msgstr "fotoğraf"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "animal_food"
 msgstr "hayvan_besini"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "news_papers"
 msgstr "gazeteler"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "toys"
 msgstr "oyuncuklar"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "stamps"
 msgstr "pullar"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "SIM-cards"
 msgstr "SIM-kart"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "telephone_vouchers"
 msgstr "telefon_kartı"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "vouchers"
 msgstr "bilet"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "condoms"
 msgstr "kondom"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "tampons"
 msgstr "tampon"
 
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2393
 msgid "excrement_bags"
 msgstr "dışkı_poşeti"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2402
 msgid "Account or loyalty cards"
 msgstr "hesap veya üyelik kartı"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2404
 msgid "Butcher"
 msgstr "kasap"
@@ -15728,10 +15637,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2406
 msgid "Edit Butcher"
 msgstr "kasap düzenle"
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2410
 msgid "Baker"
 msgstr "fırın"
@@ -15739,10 +15648,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2412
 msgid "Edit Baker"
 msgstr "fırın düzenle"
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2416
 msgid "Florist"
 msgstr ""
@@ -15750,70 +15659,84 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2418
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2422
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2423
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2427
+#, fuzzy
+msgid "Alcohol"
+msgstr "Okul"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2429
+#, fuzzy
+msgid "Edit Alcohol Shop"
+msgstr "Bisiklet dükkanı düzenle"
+
+#. item "Shops/Alcohol" text "Name"
+#: build/trans_presets.java:2433
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2431
-msgid "Edit Beverages  Shop"
-msgstr ""
+#: build/trans_presets.java:2434
+#, fuzzy
+msgid "Edit Beverages Shop"
+msgstr "araçlı alışveriş düzenle"
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2438
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2439
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2443
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2444
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2448
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2449
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2453
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2454
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2458
 msgid "Garden Centre"
 msgstr ""
@@ -15821,10 +15744,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2460
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2464
 msgid "Hardware"
 msgstr ""
@@ -15832,10 +15755,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2466
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2470
 msgid "Do-it-yourself-store"
 msgstr "kendin-al-market"
@@ -15843,60 +15766,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2472
 msgid "Edit Do-it-yourself-store"
 msgstr "kendin-al-market düzenle"
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2476
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2477
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2481
 msgid "Hairdresser"
 msgstr "berber"
 
 #. item
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2482
 msgid "Edit Hairdresser"
 msgstr "berber düzenle"
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2486
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2487
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2491
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2492
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2496
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2497
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2501
 msgid "Dry Cleaning"
 msgstr "Kuru Temizleme"
@@ -15904,10 +15827,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2503
 msgid "Edit Dry Cleaning"
 msgstr "Kuru Temizleme Düzenle"
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2507
 msgid "Laundry"
 msgstr "Çamaşırhane"
@@ -15915,10 +15838,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2509
 msgid "Edit Laundry"
 msgstr "Çamaşırhane Düzenle"
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2513
 msgid "Outdoor"
 msgstr "Dışortam"
@@ -15926,35 +15849,37 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2515
 msgid "Edit Outdoor Shop"
 msgstr "Dış ortam dükkanları düzenle"
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2516
-msgid "sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2519
+#, fuzzy
+msgid "Sports"
+msgstr "Spor"
+
+#. item
+#: build/trans_presets.java:2520
 msgid "Edit Sports Shop"
 msgstr ""
 
-#. item "Shops/sports" text "Name"
-#: build/trans_presets.java:2521
-msgid "optician"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2522
+#. item "Shops/Sports" text "Name"
+#: build/trans_presets.java:2524
+#, fuzzy
+msgid "Optician"
+msgstr "pelikan"
+
+#. item
+#: build/trans_presets.java:2525
 msgid "Edit Optician"
 msgstr ""
 
-#. item "Shops/optician" text "Name"
-#: build/trans_presets.java:2528
+#. item "Shops/Optician" text "Name"
+#: build/trans_presets.java:2531
 msgid "Cash"
 msgstr "Kasa"
 
 #. group "Cash"
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Bank"
 msgstr "Banka"
@@ -15962,5 +15887,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Bank"
 msgstr "Banka düzenle"
@@ -15968,10 +15893,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2534 build/trans_presets.java:2542
+#: build/trans_presets.java:2537 build/trans_presets.java:2545
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Money Exchange"
 msgstr "Döviz Bürosu"
@@ -15979,5 +15904,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2541
 msgid "Edit Money Exchange"
 msgstr "Döviz Bürosu Düzenle"
@@ -15985,15 +15910,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2547
 msgid "Edit Automated Teller Machine"
 msgstr "ATM Düzenle"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2552
 msgid "Health"
 msgstr "Sağlık"
 
 #. group "Health"
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Doctors"
 msgstr "Doktor"
@@ -16001,20 +15926,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Edit Doctors"
 msgstr "Doktor Düzenle"
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2559
 msgid "Dentist"
 msgstr "Dişçi"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2560
 msgid "Edit Dentist"
 msgstr "Dişçi Düzenle"
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Pharmacy"
 msgstr "Eczane"
@@ -16022,5 +15947,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Edit Pharmacy"
 msgstr "Eczane Düzenle"
@@ -16028,10 +15953,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Dispensing"
 msgstr "Dispenser"
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2571
 msgid "Hospital"
 msgstr "Hastane"
@@ -16039,10 +15964,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Edit Hospital"
 msgstr "Hastane Düzenle"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2577
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -16051,5 +15976,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:2577
+#: build/trans_presets.java:2580
 msgid "Edit Emergency Access Point"
 msgstr "Acil Durum Noktası Düzenle"
@@ -16058,20 +15983,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2583
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2584
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2586
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -16079,5 +16004,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2590
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -16086,25 +16011,25 @@
 #. <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:2590
+#: build/trans_presets.java:2593
 msgid "Edit Veterinary"
 msgstr "Veteriner Düzenle"
 
 #. group "Places"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Continent"
 msgstr "Kıta"
 
 #. item
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Country"
 msgstr "Ülke"
 
 #. item
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
@@ -16112,45 +16037,46 @@
 #. item "Places/Country" text "Name"
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2609 build/trans_presets.java:2989
+#: build/trans_presets.java:2612 build/trans_presets.java:2997
 msgid "State"
 msgstr "İl"
 
 #. item
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit State"
 msgstr "İl Düzenle"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Region"
 msgstr "Bölge"
 
 #. item
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "County"
 msgstr "vilayet"
 
 #. item
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit County"
 msgstr "vilayet Düzenle"
 
 #. item "Places/County" text "Name"
-#: build/trans_presets.java:2627
+#. <separator/>
+#: build/trans_presets.java:2631
 msgid "City"
 msgstr "Şehir"
 
 #. item
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2632
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2637
 msgid "Town"
 msgstr "Mahalle"
@@ -16158,10 +16084,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2639
 msgid "Edit Town"
 msgstr "Mahalle Düzenle"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2644
 msgid "Suburb"
 msgstr "Banliyo"
@@ -16169,30 +16095,31 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2646
 msgid "Edit Suburb"
 msgstr "Banliyo Düzenle"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2647
+#: build/trans_presets.java:2651
 msgid "Village"
 msgstr "Köy"
 
 #. item
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2652
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2657
 msgid "Hamlet"
 msgstr "Mezra"
 
 #. item
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2658
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
 
 #. item "Places/Hamlet" text "Name"
-#: build/trans_presets.java:2659
+#. <separator/>
+#: build/trans_presets.java:2664
 msgid "Locality"
 msgstr "Semt"
@@ -16200,10 +16127,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2666
 msgid "Edit Locality"
 msgstr "Semt Düzenle"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2671
 msgid "Island"
 msgstr "Ada"
@@ -16211,5 +16138,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2673
 msgid "Edit Island"
 msgstr "Ada Düzenle"
@@ -16217,5 +16144,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Mağara Girişi"
@@ -16223,10 +16150,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2681
 msgid "Edit Cave Entrance"
 msgstr "Mağara Girişi Düzenle"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2685
 msgid "Peak"
 msgstr "Zirve"
@@ -16234,10 +16161,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2687
 msgid "Edit Peak"
 msgstr "Zirve Düzenle"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Glacier"
 msgstr "Buzul"
@@ -16245,10 +16172,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2694
 msgid "Edit Glacier"
 msgstr "Buzul Düzenle"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2699
 msgid "Volcano"
 msgstr "Volkan"
@@ -16256,70 +16183,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2701
 msgid "Edit Volcano"
 msgstr "Volkan Düzenle"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Boundaries"
 msgstr "Belediye Sınırı"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2708
 msgid "National"
 msgstr "Milli"
 
 #. item
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2709
 msgid "Edit National Boundary"
 msgstr "Ülke Sınırı Düzenle"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2714
 msgid "Administrative"
 msgstr "İdari"
 
 #. item
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2715
 msgid "Edit Administrative Boundary"
 msgstr "İdari Sınırları Düzenle"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2720
 msgid "Civil"
 msgstr "Sivil"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2721
 msgid "Edit Civil Boundary"
 msgstr "Sivil Sınırları Düzenle"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2726
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2727
 msgid "Edit Political Boundary"
 msgstr "Politik Sınır Düzenle"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2732
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Edit National Park Boundary"
 msgstr "Milli Park Sınırı Düzenle"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2739
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2740
 msgid "Tree"
 msgstr "Ağaç"
@@ -16328,15 +16255,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:2738
+#: build/trans_presets.java:2743
 msgid "Edit Tree"
 msgstr "Ağaç Düzenle"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2748
 msgid "Botanical Name"
 msgstr "Botannik İsim"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2750
 msgid "Wood"
 msgstr "Orman"
@@ -16345,5 +16272,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:2748
+#: build/trans_presets.java:2753
 msgid "Edit Wood"
 msgstr "Orman Düzenle"
@@ -16351,17 +16278,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "coniferous"
 msgstr "Kozalaklı Orman"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "deciduous"
 msgstr "yaprak düken orman"
 
-#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2756 build/trans_presets.java:2765
 msgid "mixed"
 msgstr "karışık"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2758
 msgid "Forest"
 msgstr "orman"
@@ -16370,19 +16297,63 @@
 #. <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:2756
+#: build/trans_presets.java:2761
 msgid "Edit Forest Landuse"
 msgstr "orman kullanımı düzenle"
 
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2767
 msgid "Nature Reserve"
 msgstr "korunacak doğa alanı"
 
 #. item
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2768
 msgid "Edit Nature Reserve"
 msgstr "korunacak doğa alanı düzenle"
 
 #. item "Land use/Nature Reserve" text "Name"
-#: build/trans_presets.java:2767
+#. <separator/>
+#: build/trans_presets.java:2773
+msgid "Scree"
+msgstr "Taşlık Alan"
+
+#. item
+#: build/trans_presets.java:2774
+msgid "Edit Scree"
+msgstr "Taşlık Alan Düzenle"
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:2778
+msgid "Scrub"
+msgstr "Çalılık"
+
+#. item
+#: build/trans_presets.java:2779
+msgid "Edit Scrub"
+msgstr "Çalılık Düzenle"
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:2783
+msgid "Fell"
+msgstr "Dağ Eteği"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:2785
+msgid "Edit Fell"
+msgstr "Dağ Eteği Kullanımı"
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:2789
+msgid "Heath"
+msgstr "Sağlıksız Ağaç"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:2791
+msgid "Edit Heath"
+msgstr "Sağlıksız Ağaç Düzenle"
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2796
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -16391,70 +16362,71 @@
 #. <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:2770
+#: build/trans_presets.java:2799
 msgid "Edit Farmyard Landuse"
 msgstr "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2804
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2805
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2810
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2811
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2816
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2817
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2822
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2823
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
 
 #. item "Land use/Allotments" text "Name"
-#: build/trans_presets.java:2799
+#. <separator/>
+#: build/trans_presets.java:2829
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2830
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2834
 msgid "Grass"
 msgstr "Otlak"
 
 #. item
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2835
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2840
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -16462,10 +16434,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2842
 msgid "Edit Village Green Landuse"
 msgstr "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2847
 msgid "Common"
 msgstr "Genel"
@@ -16473,20 +16445,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2849
 msgid "Edit Common"
 msgstr "Genel Düzenle"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2853
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2854
 msgid "Edit Park"
 msgstr "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2858
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -16494,5 +16466,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2860
 msgid "Edit Recreation Ground Landuse"
 msgstr "oyun alanı kullanımı düzenle"
@@ -16500,15 +16472,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2866
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2867
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2872
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -16516,9 +16488,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2874
 msgid "Edit Graveyard"
 msgstr "Mezarlık Düzenle"
 
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2880
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -16526,39 +16498,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2882
 msgid "Edit Cemetery Landuse"
 msgstr "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2889
 msgid "Retail"
 msgstr "Perakende"
 
 #. item
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2890
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2895
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2896
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2901
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2902
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2907
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -16566,114 +16538,71 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2909
 msgid "Edit Railway Landuse"
 msgstr "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:2914
+msgid "Military"
+msgstr "Askeri"
+
+#. item
+#: build/trans_presets.java:2915
+msgid "Edit Military Landuse"
+msgstr "Askeri Alan Düzenle"
+
+#. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2921
+msgid "Construction area"
+msgstr "İnşaat Alanı"
+
+#. item
+#: build/trans_presets.java:2922
+msgid "Edit Construction Landuse"
+msgstr "İnşaat Alanı Düzenle"
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:2927
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2928
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2933
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2934
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2897
-msgid "Construction area"
-msgstr "İnşaat Alanı"
-
-#. item
-#: build/trans_presets.java:2898
-msgid "Edit Construction Landuse"
-msgstr "İnşaat Alanı Düzenle"
-
-#. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2939
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2940
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2945
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2946
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
 
-#. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:2915
-msgid "Military"
-msgstr "Askeri"
-
-#. item
-#: build/trans_presets.java:2916
-msgid "Edit Military Landuse"
-msgstr "Askeri Alan Düzenle"
-
-#. item "Land use/Military" text "Name"
-#. <separator/>
-#: build/trans_presets.java:2922
-msgid "Scree"
-msgstr "Taşlık Alan"
-
-#. item
-#: build/trans_presets.java:2923
-msgid "Edit Scree"
-msgstr "Taşlık Alan Düzenle"
-
-#. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2927
-msgid "Scrub"
-msgstr "Çalılık"
-
-#. item
-#: build/trans_presets.java:2928
-msgid "Edit Scrub"
-msgstr "Çalılık Düzenle"
-
-#. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2932
-msgid "Fell"
-msgstr "Dağ Eteği"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2934
-msgid "Edit Fell"
-msgstr "Dağ Eteği Kullanımı"
-
-#. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2938
-msgid "Heath"
-msgstr "Sağlıksız Ağaç"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2940
-msgid "Edit Heath"
-msgstr "Sağlıksız Ağaç Düzenle"
-
 #. group "Relations"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2955
 msgid "Multipolygon"
 msgstr ""
@@ -16683,5 +16612,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:2951
+#: build/trans_presets.java:2959
 msgid "Edit Multipolygon"
 msgstr ""
@@ -16690,10 +16619,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2965
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2966
 msgid "inner segment"
 msgstr ""
@@ -16701,5 +16630,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr ""
@@ -16708,5 +16637,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2972
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -16714,34 +16643,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2974
 msgid "only_straight_on"
 msgstr ""
@@ -16750,15 +16679,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2979
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2980
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2973
+#: build/trans_presets.java:2981
 msgid "to way"
 msgstr ""
@@ -16766,5 +16695,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr ""
@@ -16773,5 +16702,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2987
 msgid "Edit Route"
 msgstr ""
@@ -16779,5 +16708,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "Route type"
 msgstr ""
@@ -16849,24 +16778,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:2981 build/trans_style.java:206
-#: build/trans_style.java:553 build/trans_style.java:743
-#: build/trans_style.java:751 build/trans_style.java:759
-#: build/trans_style.java:767 build/trans_style.java:775
+#: build/trans_presets.java:2989 build/trans_style.java:206
+#: build/trans_style.java:645 build/trans_style.java:862
+#: build/trans_style.java:870 build/trans_style.java:878
+#: build/trans_style.java:886 build/trans_style.java:894
 msgid "bicycle"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "ski"
 msgstr ""
@@ -16911,4 +16840,7 @@
 #. <condition k="highway" v="pedestrian"/>
 #. color foot
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color foot
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -16918,19 +16850,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:2981 build/trans_style.java:220
-#: build/trans_style.java:561 build/trans_style.java:569
-#: build/trans_style.java:577 build/trans_style.java:585
+#: build/trans_presets.java:2989 build/trans_style.java:220
+#: build/trans_style.java:653 build/trans_style.java:661
+#: build/trans_style.java:669 build/trans_style.java:672
+#: build/trans_style.java:680
 msgid "foot"
 msgstr "ayak"
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:2981
+#: build/trans_presets.java:2989
 msgid "detour"
 msgstr ""
@@ -16944,10 +16877,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:2981 build/trans_style.java:1042
+#: build/trans_presets.java:2989 build/trans_style.java:1162
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2992
 msgid "Symbol description"
 msgstr ""
@@ -16955,26 +16888,26 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2995
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" combo "State"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:2997
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2998
 msgid "Color (hex)"
 msgstr ""
@@ -16983,30 +16916,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3001
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3002
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3003
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3004
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3005
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3006
 msgid "backward halt point"
 msgstr ""
@@ -17190,4 +17123,111 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="gate"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cattle_grid"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="toll_booth"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="viaduct"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="viaduct"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -17199,4 +17239,13 @@
 #. <condition k="amenity" v="signpost"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. color wood
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="marsh"/>
+#. <icon src="misc/deprecated.png"/>
+#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -17298,11 +17347,13 @@
 #: build/trans_style.java:112 build/trans_style.java:147
 #: build/trans_style.java:154 build/trans_style.java:161
-#: build/trans_style.java:497 build/trans_style.java:2150
-#: build/trans_style.java:3606 build/trans_style.java:3877
-#: build/trans_style.java:3886 build/trans_style.java:3895
-#: build/trans_style.java:3904 build/trans_style.java:3913
-#: build/trans_style.java:3922 build/trans_style.java:3931
-#: build/trans_style.java:3932 build/trans_style.java:3941
-#: build/trans_style.java:3950
+#: build/trans_style.java:589 build/trans_style.java:787
+#: build/trans_style.java:1112 build/trans_style.java:2365
+#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_style.java:3872 build/trans_style.java:4156
+#: build/trans_style.java:4165 build/trans_style.java:4174
+#: build/trans_style.java:4183 build/trans_style.java:4192
+#: build/trans_style.java:4201 build/trans_style.java:4210
+#: build/trans_style.java:4211 build/trans_style.java:4220
+#: build/trans_style.java:4229
 msgid "deprecated"
 msgstr "kırılmış"
@@ -17344,7 +17395,222 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:248 build/trans_style.java:545
+#: build/trans_style.java:248 build/trans_style.java:637
 msgid "horse"
 msgstr "at"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.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"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:355 build/trans_style.java:368
+#: build/trans_style.java:369 build/trans_style.java:382
+#: build/trans_style.java:383 build/trans_style.java:402
+#: build/trans_style.java:403 build/trans_style.java:410
+#: build/trans_style.java:423 build/trans_style.java:424
+#: build/trans_style.java:437 build/trans_style.java:438
+#: build/trans_style.java:451 build/trans_style.java:452
+#, fuzzy
+msgid "barrier"
+msgstr "Bariyer"
 
 #. color tertiary
@@ -17380,6 +17646,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:489 build/trans_style.java:505
-#: build/trans_style.java:521 build/trans_style.java:529
+#: build/trans_style.java:581 build/trans_style.java:597
+#: build/trans_style.java:613 build/trans_style.java:621
 msgid "street"
 msgstr "sokak"
@@ -17435,7 +17701,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:513 build/trans_style.java:785
-#: build/trans_style.java:793 build/trans_style.java:801
-#: build/trans_style.java:809 build/trans_style.java:817
+#: build/trans_style.java:605 build/trans_style.java:904
+#: build/trans_style.java:912 build/trans_style.java:920
+#: build/trans_style.java:928 build/trans_style.java:936
 msgid "highway_track"
 msgstr "araçyolu_hattı"
@@ -17482,108 +17748,21 @@
 #. <condition k="railway" v="turntable"/>
 #. <icon annotate="true" src="transport/turntable.png"/>
-#: build/trans_style.java:593 build/trans_style.java:1016
-#: build/trans_style.java:1074 build/trans_style.java:1082
-#: build/trans_style.java:1091
+#. 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:688 build/trans_style.java:1136
+#: build/trans_style.java:1194 build/trans_style.java:1202
+#: build/trans_style.java:1211 build/trans_style.java:1219
+#: build/trans_style.java:1220
 msgid "rail"
 msgstr "demiryolu"
 
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="vehicle/toll_booth.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#: build/trans_style.java:678 build/trans_style.java:992
-msgid "viaduct"
-msgstr "viyadük"
-
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17600,4 +17779,10 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
+#: build/trans_style.java:802
+#, fuzzy
+msgid "services"
+msgstr "servis"
+
+#. color services
 #. <icon annotate="true" src="vehicle/services.png"/>
 #. <scale_min>1</scale_min>
@@ -17607,4 +17792,10 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
+#: build/trans_style.java:810
+#, fuzzy
+msgid "ford"
+msgstr "sığ geçit"
+
+#. color ford
 #. <icon annotate="true" src="vehicle/ford.png"/>
 #. <scale_min>1</scale_min>
@@ -17621,8 +17812,22 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:714
+#: build/trans_style.java:825
 msgid "turningcircle"
 msgstr "turningcircle-döner kavşak"
 
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:842
+#, fuzzy
+msgid "emergency_access_point"
+msgstr "Acil Durum Noktası"
+
 #. color water
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -17634,5 +17839,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:835 build/trans_style.java:836
+#: build/trans_style.java:954 build/trans_style.java:955
 msgid "riverbank"
 msgstr "riverbank"
@@ -17646,5 +17851,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "akış"
@@ -17658,5 +17863,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "iskele"
@@ -17684,5 +17889,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "su_kemeri"
@@ -17697,4 +17902,5 @@
 #. <condition k="waterway" v="boatyard"/>
 #. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17734,5 +17940,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color manmade
-#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. color manmade
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -17849,12 +18055,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:927 build/trans_style.java:935
-#: build/trans_style.java:944 build/trans_style.java:1323
-#: build/trans_style.java:1330 build/trans_style.java:1339
-#: build/trans_style.java:1347 build/trans_style.java:1371
-#: build/trans_style.java:1379 build/trans_style.java:1387
-#: build/trans_style.java:1395 build/trans_style.java:1402
-#: build/trans_style.java:1411 build/trans_style.java:1419
-#: build/trans_style.java:1427 build/trans_style.java:1435
+#: build/trans_style.java:1018 build/trans_style.java:1047
+#: build/trans_style.java:1055 build/trans_style.java:1056
+#: build/trans_style.java:1064 build/trans_style.java:1498
+#: build/trans_style.java:1505 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1549
+#: build/trans_style.java:1557 build/trans_style.java:1565
+#: build/trans_style.java:1573 build/trans_style.java:1580
+#: build/trans_style.java:1589 build/trans_style.java:1597
+#: build/trans_style.java:1605 build/trans_style.java:1613
 msgid "manmade"
 msgstr "insan yapımı"
@@ -17900,5 +18107,5 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -17916,7 +18123,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:954 build/trans_style.java:969
-#: build/trans_style.java:984 build/trans_style.java:1000
-#: build/trans_style.java:1008
+#: build/trans_style.java:1074 build/trans_style.java:1089
+#: build/trans_style.java:1104 build/trans_style.java:1120
+#: build/trans_style.java:1128
 msgid "railwaypoint"
 msgstr "demiryolu_noktası"
@@ -17939,10 +18146,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1025 build/trans_style.java:1034
+#: build/trans_style.java:1145 build/trans_style.java:1154
 msgid "otherrail"
 msgstr "başka_demiryolu"
 
 #. color otherrail
-#: build/trans_style.java:1026
+#: build/trans_style.java:1146
 msgid "railover"
 msgstr "demiryolu_üzeri"
@@ -17972,6 +18179,6 @@
 #. <rule>
 #. <condition k="railway" v="abandoned"/>
-#: build/trans_style.java:1050 build/trans_style.java:1058
-#: build/trans_style.java:1066
+#: build/trans_style.java:1170 build/trans_style.java:1178
+#: build/trans_style.java:1186
 msgid "oldrail"
 msgstr "eski_demiryolu"
@@ -18016,6 +18223,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1121 build/trans_style.java:1122
-#: build/trans_style.java:1154
+#: build/trans_style.java:1250 build/trans_style.java:1251
+#: build/trans_style.java:1283
 msgid "aeroway"
 msgstr "havayolu"
@@ -18029,5 +18236,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminal"
@@ -18049,5 +18256,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1138 build/trans_style.java:1146
+#: build/trans_style.java:1267 build/trans_style.java:1275
 msgid "aeroway_dark"
 msgstr "havayolu_ağır"
@@ -18061,5 +18268,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "hafif_hafif"
@@ -18082,4 +18289,12 @@
 #.
 #. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="aerialway" v="chair_lift"/>
 #. color aerialway
@@ -18099,4 +18314,10 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
+#: build/trans_style.java:1301 build/trans_style.java:1309
+#: build/trans_style.java:1317 build/trans_style.java:1325
+#: build/trans_style.java:1333
+msgid "aerialway"
+msgstr "havayolu"
+
 #. color aerialway
 #. <icon annotate="true" src="transport/aerialway/station.png"/>
@@ -18105,23 +18326,10 @@
 #. </rule>
 #.
-#. <rule>
-#. <condition k="aerialway" v="gondola"/>
-#: build/trans_style.java:1172 build/trans_style.java:1180
-#: build/trans_style.java:1188 build/trans_style.java:1196
-#: build/trans_style.java:1204
-msgid "aerialway"
-msgstr "havayolu"
-
-#. color aerialway
-#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
 #. <!-- piste tags -->
 #.
 #. <rule>
 #. <condition k="piste:difficulty" v="easy"/>
-#: build/trans_style.java:1214
+#. color piste_easy
+#: build/trans_style.java:1343 build/trans_style.java:1344
 msgid "piste_easy"
 msgstr "basit_meydan"
@@ -18135,5 +18343,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="intermediate"/>
-#: build/trans_style.java:1222
+#. color piste_intermediate
+#: build/trans_style.java:1352 build/trans_style.java:1353
 msgid "piste_intermediate"
 msgstr "orta_meydan"
@@ -18147,5 +18356,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="advanced"/>
-#: build/trans_style.java:1230
+#. color piste_advanced
+#: build/trans_style.java:1361 build/trans_style.java:1362
 msgid "piste_advanced"
 msgstr "büyük_meydan"
@@ -18158,6 +18368,21 @@
 #.
 #. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1370 build/trans_style.java:1371
+#, fuzzy
+msgid "piste_expert"
+msgstr "acemiKullanıcı_meydanı"
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="piste:difficulty" v="freeride"/>
-#: build/trans_style.java:1238
+#. color piste_freeride
+#: build/trans_style.java:1379 build/trans_style.java:1380
 msgid "piste_freeride"
 msgstr "acemiKullanıcı_meydanı"
@@ -18171,5 +18396,6 @@
 #. <rule>
 #. <condition k="piste:difficulty" v="novice"/>
-#: build/trans_style.java:1246
+#. color piste_novice
+#: build/trans_style.java:1388 build/trans_style.java:1389
 msgid "piste_novice"
 msgstr "acemiKullanıcı_meydanı"
@@ -18200,4 +18426,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="sub_station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -18232,4 +18466,28 @@
 #.
 #. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power_source" v="nuclear"/>
 #. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -18242,8 +18500,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1257 build/trans_style.java:1264
-#: build/trans_style.java:1273 build/trans_style.java:1281
-#: build/trans_style.java:1289 build/trans_style.java:1297
-#: build/trans_style.java:1305 build/trans_style.java:1313
+#: build/trans_style.java:1400 build/trans_style.java:1407
+#: build/trans_style.java:1416 build/trans_style.java:1424
+#: build/trans_style.java:1432 build/trans_style.java:1440
+#: build/trans_style.java:1448 build/trans_style.java:1456
+#: build/trans_style.java:1464 build/trans_style.java:1472
+#: build/trans_style.java:1480 build/trans_style.java:1488
 msgid "power"
 msgstr "güç"
@@ -18256,5 +18516,8 @@
 #. <rule>
 #. <condition k="man_made" v="pier"/>
-#: build/trans_style.java:1354
+#. <!-- seems to be common to use area=yes for areas here -->
+#. <!-- some people seem to have problems that polylines displayed as areas, so comment this out -->
+#. color pier
+#: build/trans_style.java:1531 build/trans_style.java:1532
 msgid "pier"
 msgstr "iskele"
@@ -18268,5 +18531,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "suhattı"
@@ -18394,12 +18657,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1445 build/trans_style.java:1453
-#: build/trans_style.java:1461 build/trans_style.java:1469
-#: build/trans_style.java:1477 build/trans_style.java:1485
-#: build/trans_style.java:1501 build/trans_style.java:1509
-#: build/trans_style.java:1517 build/trans_style.java:1525
-#: build/trans_style.java:1533 build/trans_style.java:1541
-#: build/trans_style.java:1549 build/trans_style.java:1557
-#: build/trans_style.java:1565
+#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1639 build/trans_style.java:1647
+#: build/trans_style.java:1655 build/trans_style.java:1663
+#: build/trans_style.java:1679 build/trans_style.java:1687
+#: build/trans_style.java:1695 build/trans_style.java:1703
+#: build/trans_style.java:1711 build/trans_style.java:1719
+#: build/trans_style.java:1727 build/trans_style.java:1735
+#: build/trans_style.java:1743
 msgid "leisure"
 msgstr "dinlenme_yeri"
@@ -18413,5 +18676,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1493
+#: build/trans_style.java:1671
 msgid "marina"
 msgstr ""
@@ -18483,8 +18746,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1575 build/trans_style.java:1583
-#: build/trans_style.java:1591 build/trans_style.java:1599
-#: build/trans_style.java:1607 build/trans_style.java:1615
-#: build/trans_style.java:1623 build/trans_style.java:1631
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769 build/trans_style.java:1777
+#: build/trans_style.java:1785 build/trans_style.java:1793
+#: build/trans_style.java:1801 build/trans_style.java:1809
 msgid "amenity"
 msgstr "dinlenme_yeri"
@@ -18520,4 +18783,12 @@
 #.
 #. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="parking"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -18577,11 +18848,11 @@
 #. <rule>
 #. <condition k="amenity" v="fuel"/>
-#. <icon annotate="true" src="vehicle/fuel.png"/>
-#: build/trans_style.java:1639 build/trans_style.java:1647
-#: build/trans_style.java:1655 build/trans_style.java:1663
-#: build/trans_style.java:1671 build/trans_style.java:1679
-#: build/trans_style.java:1687 build/trans_style.java:1695
-#: build/trans_style.java:1702 build/trans_style.java:1711
-#: build/trans_style.java:1719
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1817 build/trans_style.java:1825
+#: build/trans_style.java:1833 build/trans_style.java:1841
+#: build/trans_style.java:1849 build/trans_style.java:1857
+#: build/trans_style.java:1865 build/trans_style.java:1873
+#: build/trans_style.java:1881 build/trans_style.java:1888
+#: build/trans_style.java:1897 build/trans_style.java:1905
 msgid "amenity_traffic"
 msgstr "tail_trafiği"
@@ -18720,6 +18991,27 @@
 #.
 #. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="religion" v="taoist"/>
 #. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18946,22 +19238,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1727 build/trans_style.java:1735
-#: build/trans_style.java:1743 build/trans_style.java:1751
-#: build/trans_style.java:1759 build/trans_style.java:1767
-#: build/trans_style.java:1775 build/trans_style.java:1783
-#: build/trans_style.java:1877 build/trans_style.java:1885
-#: build/trans_style.java:1892 build/trans_style.java:1901
-#: build/trans_style.java:1909 build/trans_style.java:1917
-#: build/trans_style.java:1925 build/trans_style.java:1933
-#: build/trans_style.java:1941 build/trans_style.java:1949
-#: build/trans_style.java:2004 build/trans_style.java:2012
-#: build/trans_style.java:2020 build/trans_style.java:2029
-#: build/trans_style.java:2037 build/trans_style.java:2044
-#: build/trans_style.java:2052 build/trans_style.java:2060
-#: build/trans_style.java:2068 build/trans_style.java:2076
+#: build/trans_style.java:1913 build/trans_style.java:1921
+#: build/trans_style.java:1929 build/trans_style.java:1937
+#: build/trans_style.java:1945 build/trans_style.java:1953
+#: build/trans_style.java:1961 build/trans_style.java:1969
 #: build/trans_style.java:2084 build/trans_style.java:2092
-#: build/trans_style.java:2100 build/trans_style.java:2108
+#: build/trans_style.java:2099 build/trans_style.java:2108
 #: build/trans_style.java:2116 build/trans_style.java:2124
-#: build/trans_style.java:2133 build/trans_style.java:2141
+#: build/trans_style.java:2132 build/trans_style.java:2140
+#: build/trans_style.java:2148 build/trans_style.java:2156
+#: build/trans_style.java:2219 build/trans_style.java:2227
+#: build/trans_style.java:2235 build/trans_style.java:2244
+#: build/trans_style.java:2252 build/trans_style.java:2259
+#: build/trans_style.java:2267 build/trans_style.java:2275
+#: build/trans_style.java:2283 build/trans_style.java:2291
+#: build/trans_style.java:2299 build/trans_style.java:2307
+#: build/trans_style.java:2315 build/trans_style.java:2323
+#: build/trans_style.java:2331 build/trans_style.java:2339
+#: build/trans_style.java:2348 build/trans_style.java:2356
 msgid "amenity_light"
 msgstr "eski_sokak_lambası"
@@ -18993,6 +19285,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1791 build/trans_style.java:1799
-#: build/trans_style.java:2988
+#: build/trans_style.java:1977 build/trans_style.java:1985
+#: build/trans_style.java:3236
 msgid "light_water"
 msgstr "su_lambası"
@@ -19028,4 +19320,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="doctors"/>
 #. color health
@@ -19045,7 +19345,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:1956 build/trans_style.java:1964
-#: build/trans_style.java:1972 build/trans_style.java:1980
-#: build/trans_style.java:1988 build/trans_style.java:1996
+#: build/trans_style.java:2163 build/trans_style.java:2171
+#: build/trans_style.java:2179 build/trans_style.java:2188
+#: build/trans_style.java:2195 build/trans_style.java:2203
+#: build/trans_style.java:2211
 msgid "health"
 msgstr "sağlık"
@@ -19139,4 +19440,12 @@
 #.
 #. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="beverages"/>
 #. <icon annotate="true" src="shop/beverages.png"/>
@@ -19339,4 +19648,20 @@
 #.
 #. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="shop" v="tailor"/>
 #. <icon annotate="true" src="shop/tailor.png"/>
@@ -19370,28 +19695,30 @@
 #. </rule>
 #.
-#. <!-- duplicate of shop_centre? -->
-#. <rule>
-#. <condition k="shop" v="shop_center"/>
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2160 build/trans_style.java:2168
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2192 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:2256 build/trans_style.java:2264
-#: build/trans_style.java:2272 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2368 build/trans_style.java:2376
-#: build/trans_style.java:2384 build/trans_style.java:2392
-#: build/trans_style.java:2400 build/trans_style.java:2408
-#: build/trans_style.java:2416 build/trans_style.java:2424
-#: build/trans_style.java:2432 build/trans_style.java:2440
-#: build/trans_style.java:2448 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2473
+#: 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:2447
+#: build/trans_style.java:2455 build/trans_style.java:2463
+#: build/trans_style.java:2471 build/trans_style.java:2479
+#: build/trans_style.java:2487 build/trans_style.java:2495
+#: build/trans_style.java:2503 build/trans_style.java:2511
+#: build/trans_style.java:2519 build/trans_style.java:2527
+#: build/trans_style.java:2535 build/trans_style.java:2543
+#: build/trans_style.java:2551 build/trans_style.java:2559
+#: build/trans_style.java:2567 build/trans_style.java:2575
+#: build/trans_style.java:2583 build/trans_style.java:2591
+#: build/trans_style.java:2599 build/trans_style.java:2607
+#: build/trans_style.java:2615 build/trans_style.java:2623
+#: build/trans_style.java:2631 build/trans_style.java:2639
+#: build/trans_style.java:2647 build/trans_style.java:2655
+#: build/trans_style.java:2663 build/trans_style.java:2671
+#: build/trans_style.java:2679 build/trans_style.java:2687
+#: build/trans_style.java:2695 build/trans_style.java:2703
+#: build/trans_style.java:2712
 msgid "shop"
 msgstr "alışveriş"
@@ -19445,4 +19772,12 @@
 #.
 #. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="tourism" v="camp_site"/>
 #. <icon annotate="true" src="accommodation/camping.png"/>
@@ -19455,8 +19790,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2483 build/trans_style.java:2491
-#: build/trans_style.java:2499 build/trans_style.java:2507
-#: build/trans_style.java:2515 build/trans_style.java:2523
-#: build/trans_style.java:2531
+#: 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
 msgid "hotel"
 msgstr "hotel"
@@ -19511,4 +19846,5 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19605,9 +19941,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2539 build/trans_style.java:2547
-#: build/trans_style.java:2555 build/trans_style.java:2563
-#: build/trans_style.java:2571 build/trans_style.java:2579
-#: build/trans_style.java:2587 build/trans_style.java:2603
-#: build/trans_style.java:2674
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2827 build/trans_style.java:2835
+#: build/trans_style.java:2851 build/trans_style.java:2922
 msgid "tourism"
 msgstr "turizm"
@@ -19679,8 +20015,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2732 build/trans_style.java:2740
+#: build/trans_style.java:2932 build/trans_style.java:2940
+#: build/trans_style.java:2948 build/trans_style.java:2956
+#: build/trans_style.java:2964 build/trans_style.java:2972
+#: build/trans_style.java:2980 build/trans_style.java:2988
 msgid "historic"
 msgstr "tarihi"
@@ -19750,9 +20086,9 @@
 #.
 #. <rule>
-#. <condition k="landuse" v="leisure_ground"/>
-#: build/trans_style.java:2749 build/trans_style.java:2757
-#: build/trans_style.java:2765 build/trans_style.java:2773
-#: build/trans_style.java:2821 build/trans_style.java:2829
-#: build/trans_style.java:2927 build/trans_style.java:2935
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_style.java:2997 build/trans_style.java:3005
+#: build/trans_style.java:3013 build/trans_style.java:3021
+#: build/trans_style.java:3069 build/trans_style.java:3077
+#: build/trans_style.java:3175 build/trans_style.java:3183
 msgid "green"
 msgstr "yeşil"
@@ -19766,5 +20102,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "taş_ocağı"
@@ -19778,5 +20114,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "toprak_doldurma"
@@ -19798,5 +20134,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:2797 build/trans_style.java:2805
+#: build/trans_style.java:3045 build/trans_style.java:3053
 msgid "basin"
 msgstr "havza"
@@ -19810,5 +20146,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "orman"
@@ -19822,5 +20158,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "çiftlik"
@@ -19843,5 +20179,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:2854 build/trans_style.java:2862
+#: build/trans_style.java:3102 build/trans_style.java:3110
 msgid "retail"
 msgstr "perakende"
@@ -19855,5 +20191,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "endüstri"
@@ -19867,5 +20203,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "ağaçsız_alan"
@@ -19879,5 +20215,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "yeşil_alan"
@@ -19891,5 +20227,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "demiryolu"
@@ -19946,7 +20282,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:2911 build/trans_style.java:2946
-#: build/trans_style.java:2954 build/trans_style.java:2962
-#: build/trans_style.java:2970 build/trans_style.java:2978
+#: build/trans_style.java:3159 build/trans_style.java:3194
+#: build/trans_style.java:3202 build/trans_style.java:3210
+#: build/trans_style.java:3218 build/trans_style.java:3226
 msgid "military"
 msgstr "askeri"
@@ -19960,5 +20296,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "mezarlık"
@@ -19971,5 +20307,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "zirve"
@@ -19984,5 +20320,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3004
+#: build/trans_style.java:3252
 msgid "glacier"
 msgstr "buzul"
@@ -19996,5 +20332,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3012
+#: build/trans_style.java:3260
 msgid "volcano"
 msgstr "volkanik"
@@ -20009,4 +20345,5 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20048,7 +20385,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3108
-#: build/trans_style.java:3116 build/trans_style.java:3124
+#: build/trans_style.java:3268 build/trans_style.java:3269
+#: build/trans_style.java:3277 build/trans_style.java:3293
+#: build/trans_style.java:3366 build/trans_style.java:3374
+#: build/trans_style.java:3382
 msgid "natural"
 msgstr "doğal"
@@ -20062,5 +20400,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3036
+#: build/trans_style.java:3285
 msgid "scrub"
 msgstr "çalılık"
@@ -20074,5 +20412,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3052
+#: build/trans_style.java:3301
 msgid "heath"
 msgstr "çalılık"
@@ -20086,5 +20424,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3060
+#: build/trans_style.java:3309
 msgid "wood"
 msgstr "orman"
@@ -20098,5 +20436,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3092
+#: build/trans_style.java:3350
 msgid "mud"
 msgstr "çamur"
@@ -20110,5 +20448,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3100
+#: build/trans_style.java:3358
 msgid "beach"
 msgstr "sahil"
@@ -20186,8 +20524,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3140 build/trans_style.java:3148
-#: build/trans_style.java:3156 build/trans_style.java:3164
-#: build/trans_style.java:3172 build/trans_style.java:3180
-#: build/trans_style.java:3188 build/trans_style.java:3196
+#: build/trans_style.java:3398 build/trans_style.java:3406
+#: build/trans_style.java:3414 build/trans_style.java:3422
+#: build/trans_style.java:3430 build/trans_style.java:3438
+#: build/trans_style.java:3446 build/trans_style.java:3454
 msgid "route"
 msgstr "rut"
@@ -20235,7 +20573,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3238
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496
 msgid "boundary"
 msgstr "sınırlar"
@@ -20377,10 +20715,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3654 build/trans_style.java:3662
-#: build/trans_style.java:3670 build/trans_style.java:3678
-#: build/trans_style.java:3686 build/trans_style.java:3694
-#: build/trans_style.java:3702 build/trans_style.java:3710
-#: build/trans_style.java:3718 build/trans_style.java:3726
-#: build/trans_style.java:3734 build/trans_style.java:3742
+#: build/trans_style.java:3920 build/trans_style.java:3928
+#: build/trans_style.java:3936 build/trans_style.java:3944
+#: build/trans_style.java:3952 build/trans_style.java:3960
+#: build/trans_style.java:3968 build/trans_style.java:3976
+#: build/trans_style.java:3984 build/trans_style.java:3992
+#: build/trans_style.java:4000 build/trans_style.java:4008
 msgid "place"
 msgstr "yer"
@@ -20421,6 +20759,13 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="all"/>
-#: build/trans_style.java:3853 build/trans_style.java:3860
-#: build/trans_style.java:3867
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: build/trans_style.java:4125 build/trans_style.java:4132
+#: build/trans_style.java:4139 build/trans_style.java:4146
 msgid "address"
 msgstr "adres"
@@ -20702,154 +21047,38 @@
 msgstr "Streets NRW Geofabrik.de"
 
-#~ msgid ""
-#~ "If your gps device draws too few lines, select this to draw lines along "
-#~ "your way."
-#~ msgstr "GPS çok az ölçüm yapmışsa, bu yolu yön olarak seç"
-
-#~ msgid "Navigate"
-#~ msgstr "Yol Bul"
-
-#~ msgid "Navigator"
+#, fuzzy
+#~ msgid "..."
+#~ msgstr "Aç..."
+
+#~ msgid "Commit comment"
+#~ msgstr "Açıklamayı Kabul Ediniz"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Bu bu bilgiyi desteklemiyor."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Aktarım hata nedeniyle kesildi (5 sn bekle):"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Gerçekten  ''yapılmış'' olarak işaretlemek istiyormusunuz?"
+
+#~ msgid "Navigation"
 #~ msgstr "Navigasyon"
 
-#~ msgid "Set start/end for routing. Middle mouse button to reset."
-#~ msgstr "Rut için başlangıç/bitiş ayarla. Fare orta düğmesi sıfırlar."
-
-#~ msgid "Reset Graph"
-#~ msgstr "Grafik Sıfırla"
-
-#~ msgid "Please select something from the conflict list."
-#~ msgstr "Lütfen çelişki listesinden bir seçim yapınız."
-
-#~ msgid "Please select a color."
-#~ msgstr "Lütfen Bir Renk Seçiniz."
-
-#~ msgid "Don't launch in fullscreen mode"
-#~ msgstr "Tam ekran ise çalıştırma"
-
-#~ msgid "News about JOSM"
-#~ msgstr "JOSM Haberleri"
-
-#~ msgid "Click to create a new way to the existing node."
-#~ msgstr "Varolan kavşağa yeni yol eklemek için tıklayınız."
-
-#~ msgid "Click to make a connection to the existing node."
-#~ msgstr "Varolan kavşağı bağlamak için tıklayınız"
-
-#~ msgid "Click to insert a node and create a new way."
-#~ msgstr "Kavşak eklemek ve yeni yol oluşturmak için tıklayınız."
-
-#~ msgid "Click to insert a new node and make a connection."
-#~ msgstr "Yeni bir kavşağa, bağlantı yapmak için tıklayınız."
-
-#~ msgid "Upload this trace..."
-#~ msgstr "Bu izi yükle..."
-
-#~ msgid ""
-#~ "<html>This functionality has been added only recently. Please<br>use with "
-#~ "care and check if it works as expected.</html>"
-#~ msgstr ""
-#~ "<html>Bu özellik yeni eklenildi. Lütfen<br> kullanırken dikkatli "
-#~ "kullanınız.</html>"
-
-#~ msgid "Upload track filtered by JOSM"
-#~ msgstr "JOSM tarafından filtrelenen izleri yükle"
-
-#~ msgid "Upload raw file: "
-#~ msgstr "Ham dosya yükle: "
-
-#~ msgid "Tags (keywords in GPX):"
-#~ msgstr "Etiketler (GPX deki anahtar isimler):"
-
-#~ msgid "GPX-Upload"
-#~ msgstr "GPX-Yükle"
-
-#~ msgid "time"
-#~ msgstr "zaman"
-
-#~ msgid "desc"
-#~ msgstr "Tanım"
-
-#~ msgid "symbol"
-#~ msgstr "sembol"
-
-#~ msgid "Upload raw file: {0}"
-#~ msgstr "Ham dosya yükle: {0}"
-
-#~ msgid "Tags:"
-#~ msgstr "Etiketler:"
-
-#~ msgid "Choose the hue for the track color by the velocity at that point."
-#~ msgstr "Bu nokta için ivme izini gösteren rengi seç."
-
-#~ msgid "Edit an Exit"
-#~ msgstr "çıkış düzenle"
-
-#~ msgid "Exit Number"
-#~ msgstr "Çıkış numarası"
-
-#~ msgid "Exit Name"
-#~ msgstr "Çıkış ismi"
-
-#~ msgid "Waterway"
-#~ msgstr "Su yolu"
-
-#~ msgid "Information point"
-#~ msgstr "Bilgi Noktası"
-
-#~ msgid "political"
-#~ msgstr "politik"
-
-#~ msgid "National_park"
-#~ msgstr "Milli_Park"
-
-#~ msgid "Natural"
-#~ msgstr "Doğal"
-
-#~ msgid "Add Site"
-#~ msgstr "Site Ekle"
-
-#~ msgid "Delete Site(s)"
-#~ msgstr "Site Sil"
-
-#~ msgid "Please select the site to delete."
-#~ msgstr "Silmek için site seçiniz."
-
-#~ msgid "Check Site(s)"
-#~ msgstr "Siteleri Kopntrol et"
-
-#~ msgid "Please select the site(s) to check for updates."
-#~ msgstr "güncellemeleri kontrol için siteleri seçiniz."
-
-#~ msgid "Add a new plugin site."
-#~ msgstr "Yeni eklenti sitesi seçiniz."
-
-#~ msgid "Delete the selected site(s) from the list."
-#~ msgstr "Seçili listeleri listeden sil."
-
-#~ msgid "Check the selected site(s) for new plugins or updates."
-#~ msgstr "Seçili sitelerdeki güncellemelere bak."
-
-#~ msgid "Update Sites"
-#~ msgstr "Siteleri güncelle"
-
-#~ msgid "Version"
-#~ msgstr "Versiyon"
-
-#~ msgid "Install"
-#~ msgstr "yükle"
-
-#~ msgid "Signpost"
-#~ msgstr "sinyalizasyon"
-
-#~ msgid "office"
-#~ msgstr "ofis"
-
-#~ msgid "guidepost"
-#~ msgstr "yol işareti"
-
-#~ msgid "Update Site URL"
-#~ msgstr "Site linki güncelle"
-
-#~ msgid "Invalid URL"
-#~ msgstr "Geçersi Link"
+#~ msgid "Drawbridge"
+#~ msgstr "Asma Köprü"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Asma Köprü düzenle"
+
+#~ msgid "Portcullis"
+#~ msgstr "Demir parmaklık"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Demir parmaklık düzenle"
+
+#~ msgid "Charge"
+#~ msgstr "Para Değişim"
+
+#~ msgid "viaduct"
+#~ msgstr "viyadük"