Changeset 14844 in osm for applications/editors/josm/i18n/po/en_GB.po

Timestamp:

2009-04-30T15:37:30+02:00 (15 years ago)

Author:

stoecker

Message:

updated

File:

• applications/editors/josm/i18n/po/en_GB.po (modified) (466 diffs)

applications/editors/josm/i18n/po/en_GB.po

@@ -1 +1 @@
 # 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 @@
 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 +80 @@
 #: ../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 +94 @@
 #: ../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 +102 @@
 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 +131 @@
 #. 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 +273 @@
 #: ../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 +409 @@
 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 +416 @@
 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 +531 @@
 #: ../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 +650 @@
 
 #: ../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 +658 @@
 #: ../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 +712 @@
 #, 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 +720 @@
 "\">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 +786 @@
 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 +941 @@
 #: ../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 +1063 @@
 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 +1071 @@
 "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 +1100 @@
 "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 +1182 @@
 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 +1201 @@
 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 +1215 @@
 "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 +1225 @@
 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 +1238 @@
 "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 +1246 @@
 "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 +1399 @@
 "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 +1572 @@
 #: ../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 +1627 @@
 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 +1662 @@
 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 +2079 @@
 #: ../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 +2272 @@
 
 #: ../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 +2292 @@
 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 +2420 @@
 #: ../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 +2446 @@
 #: ../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 +2512 @@
 #: ../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 +2524 @@
 #: ../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 +2552 @@
 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 +2631 @@
 
 #: ../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 +2705 @@
 "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 +2905 @@
 #: ../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 +2930 @@
 #: ../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 +3115 @@
 #. 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 +3161 @@
 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 +3234 @@
 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 +3277 @@
 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 +3361 @@
 #: ../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 +3473 @@
 #. <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 +3518 @@
 #: ../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 +3585 @@
 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 +3739 @@
 #: ../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 +3843 @@
 
 #: ../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 +3864 @@
 #, java-format
 msgid "{0} meters"
-msgstr "{0} meters"
+msgstr "{0} metres"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:704
@@ -3899 +3904 @@
 "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 +3939 @@
 
 #: ../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 +4057 @@
 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 +4394 @@
 #. 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 +4477 @@
 #. 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 +4560 @@
 #. 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 +4570 @@
 #. 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 +4593 @@
 #. 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 +4765 @@
 #. 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 +4799 @@
 #. 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 +4883 @@
 #. 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 +4941 @@
 #. <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 +4953 @@
 #. <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 +4959 @@
 #. <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 +4981 @@
 #: 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 +5154 @@
 
 #: ../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 +5179 @@
 #: ../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 +5220 @@
 #. 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 +5291 @@
 
 #: ../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 +5343 @@
 "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 +5568 @@
 #: ../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 +5595 @@
 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 +5930 @@
 
 #. 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 +5943 @@
 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 +6022 @@
 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 +6077 @@
 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 +6083 @@
 "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 +6091 @@
 "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 +6263 @@
 #: 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 +6448 @@
 
 #: ../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 +6456 @@
 "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 +6491 @@
 #. 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 +6874 @@
 "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 +6980 @@
 #: ../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 +7075 @@
 #: ../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 +7138 @@
 #: ../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 +7254 @@
 #: ../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 +7765 @@
 #. <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 +8065 @@
 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 +8082 @@
 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 +8114 @@
 "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 +8174 @@
 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 +8182 @@
 "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 +8255 @@
 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 +8384 @@
 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 +8426 @@
 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 +8479 @@
 
 #: ../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 +8486 @@
 #: ../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 +8622 @@
 #. 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 +8718 @@
 #: ../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 +8745 @@
 
 #: ../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 +9361 @@
 #. </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 +9446 @@
 #. <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 +9460 @@
 #. <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 +9757 @@
 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 +9793 @@
 #. 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 +9845 @@
 #: build/trans_plugins.java:23
 msgid "Helps vectorizing WMS images."
-msgstr "Helps vectorizing WMS images."
+msgstr "Helps vectorising WMS images."
 
 #. Plugin livegps
@@ -9880 +9900 @@
 "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 +9932 @@
 
 #. 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 +9953 @@
 
 #. 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 +9972 @@
 
 #. 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 +9981 @@
 
 #. 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 +9990 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -10052 +10079 @@
 #: 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 +10132 @@
 #: 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 +10175 @@
 #: 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 +10221 @@
 #: 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 +10275 @@
 #: 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 +10323 @@
 #: 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 +10368 @@
 #: 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 +10413 @@
 #: 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 +10569 @@
 #: 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 +10617 @@
 #: 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 +10647 @@
 #: 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 +10656 @@
 #: 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 +10668 @@
 #: 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 +10818 @@
 #. 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 +10837 @@
 #: 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 +10980 @@
 #: 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 +10994 @@
 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 +11082 @@
 #: 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 +11125 @@
 #. 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 +11144 @@
 #. </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 +11150 @@
 #. </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 +11156 @@
 #. </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 +11162 @@
 #. </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 +11168 @@
 #. </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 +11174 @@
 #. </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 +11198 @@
 #. <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 +11223 @@
 #. <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 +11248 @@
 #. <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 +11273 @@
 #. <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 +11286 @@
 #. <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 +11302 @@
 #. <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 +11318 @@
 #. <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 +11343 @@
 #. <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 +11383 @@
 
 #. 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 +11392 @@
 #. <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 +11734 @@
 #. 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 +11766 @@
 #. 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 +11787 @@
 #. 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 +11794 @@
 #. 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 +11802 @@
 #. 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 +11949 @@
 #. 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 +11966 @@
 
 #. 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 +11986 @@
 #. <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 +11998 @@
 #. <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 +12222 @@
 #. 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 +12228 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1026
 msgid "Drain"
 msgstr "Drain"
@@ -12349 +12234 @@
 #. 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 +12245 @@
 #. 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 +12256 @@
 #. 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 +12269 @@
 #. 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 +12275 @@
 #. 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 +12291 @@
 #. 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 +12307 @@
 #. 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 +12323 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1092
 msgid "Riverbank"
 msgstr "Riverbank"
@@ -12445 +12330 @@
 #. <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 +12344 @@
 #. 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 +12401 @@
 #. 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 +12422 @@
 #. 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 +12433 @@
 #. 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 +12439 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1138
 msgid "Ferry Route"
 msgstr "Ferry Route"
@@ -12560 +12445 @@
 #. 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 +12452 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1148
 msgid "Boatyard"
 msgstr "Boatyard"
@@ -12573 +12458 @@
 #. 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 +12469 @@
 #. 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 +12475 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1163
 msgid "Dam"
 msgstr "Dam"
@@ -12596 +12481 @@
 #. 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 +12498 @@
 #. <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 +12504 @@
 #. 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 +12526 @@
 #. <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 +12542 @@
 #. 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 +12553 @@
 #. 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 +12566 @@
 #. 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 +12572 @@
 #. 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 +12583 @@
 #. 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 +12611 @@
 #. <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 +12626 @@
 #. 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 +12662 @@
 #. 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 +12708 @@
 #. 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 +12715 @@
 #. </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 +12731 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1294
 msgid "Level Crossing"
 msgstr "Level Crossing"
@@ -12853 +12738 @@
 #. <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 +12746 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1302
 msgid "Crossing type"
 msgstr "Crossing type"
@@ -12867 +12752 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1308
 msgid "Turntable"
 msgstr "Turntable"
@@ -12874 +12759 @@
 #. <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 +12770 @@
 #. 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 +12781 @@
 #. 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 +12792 @@
 #. 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 +12832 @@
 #. 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 +12846 @@
 #. -->
 #. </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 +12854 @@
 #. <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 +12860 @@
 #. 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 +12902 @@
 #. 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 +12908 @@
 #. 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 +12924 @@
 #. 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 +12931 @@
 #. <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 +12942 @@
 #. 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 +12948 @@
 #. 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 +12955 @@
 #. <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 +12962 @@
 #. <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 +12978 @@
 #. 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 +12984 @@
 #. 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 +12990 @@
 #. 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 +12997 @@
 #. <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 +13003 @@
 #. 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 +13010 @@
 #. <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 +13020 @@
 #. <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 +13026 @@
 #. 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 +13038 @@
 #. <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 +13050 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -13158 +13057 @@
 #. <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 +13063 @@
 #. 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 +13071 @@
 #. 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 +13077 @@
 #. 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 +13088 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Taxi"
 msgstr "Taxi"
@@ -13195 +13094 @@
 #. 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 +13100 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "Airport"
 msgstr "Airport"
@@ -13207 +13106 @@
 #. 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 +13123 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1528
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -13234 +13133 @@
 #. <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 +13140 @@
 #. <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 +13156 @@
 #. 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 +13177 @@
 #. 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 +13188 @@
 #. 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 +13219 @@
 #. 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 +13233 @@
 #. <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 +13239 @@
 #. 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 +13245 @@
 #. 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 +13251 @@
 #. 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 +13313 @@
 #. 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 +13323 @@
 #. 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 +13334 @@
 #. 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 +13355 @@
 #. 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 +13366 @@
 #. 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 +13388 @@
 #. 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 +13461 @@
 #. 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 +13545 @@
 #. 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 +13572 @@
 #. <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 +13594 @@
 #. <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 +13627 @@
 #. 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 +13673 @@
 #. 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 +13689 @@
 #. 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 +13711 @@
 #. 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 +13789 @@
 #.
 #. <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 +14086 @@
 #. <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 +14118 @@
 #. 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 +14377 @@
 #. 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 +14569 @@
 #. 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 +14628 @@
 #. 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 +14807 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2044
 msgid "Public Building"
 msgstr "Public Building"
@@ -14901 +14813 @@
 #. 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 +14824 @@
 #. 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 +14835 @@
 #. 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 +14847 @@
 #. <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 +14859 @@
 #. <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 +14872 @@
 #. 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 +14884 @@
 #. <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 +14895 @@
 #. 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 +14901 @@
 #. 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 +14917 @@
 #. 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 +14928 @@
 #. 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 +14939 @@
 #. 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 +14945 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2122
 msgid "Cinema"
 msgstr "Cinema"
@@ -15040 +14952 @@
 #. <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 +14964 @@
 #. <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 +14975 @@
 #. 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 +14987 @@
 #. <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 +15000 @@
 #. 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 +15007 @@
 #. 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 +15015 @@
 #. 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 +15084 @@
 #. 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 +15167 @@
 #. <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 +15173 @@
 #. 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 +15179 @@
 #. 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 +15200 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2174
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15294 +15207 @@
 #. <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 +15213 @@
 #. 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 +15286 @@
 #. 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 +15297 @@
 #. 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 +15308 @@
 #. 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 +15321 @@
 #. 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 +15332 @@
 #. 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 +15343 @@
 #. 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 +15354 @@
 #. 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 +15365 @@
 #. 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 +15371 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2254
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -15461 +15379 @@
 #. 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 +15420 @@
 #. <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 +15432 @@
 #. <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 +15438 @@
 #. 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 +15452 @@
 #. 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 +15458 @@
 #. 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 +15465 @@
 #. <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 +15491 @@
 #. 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 +15513 @@
 #. <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 +15519 @@
 #. 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 +15525 @@
 #. 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 +15531 @@
 #. 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 +15537 @@
 #. 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 +15543 @@
 #. 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 +15560 @@
 #. <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 +15566 @@
 #. 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 +15603 @@
 #. <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 +15624 @@
 #. 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 +15648 @@
 #. <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 +15660 @@
 #. <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 +15671 @@
 #. 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 +15697 @@
 #. 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 +15708 @@
 #. 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 +15719 @@
 #. 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 +15725 @@
 #. 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 +15814 @@
 #. 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 +15825 @@
 #. 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 +15836 @@
 #. 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 +15921 @@
 #. 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 +15932 @@
 #. 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 +15943 @@
 #. 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 +16004 @@
 #. 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 +16015 @@
 #. 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 +16026 @@
 #. 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 +16064 @@
 #. 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 +16070 @@
 #. 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 +16081 @@
 #. 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 +16087 @@
 #. 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 +16103 @@
 #. 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 +16124 @@
 #. 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 +16130 @@
 #. 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 +16141 @@
 #. 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 +16153 @@
 #. <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 +16160 @@
 #. <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 +16181 @@
 #. 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 +16188 @@
 #. <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 +16214 @@
 #. 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 +16261 @@
 #. 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 +16272 @@
 #. 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 +16304 @@
 #. 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 +16315 @@
 #. 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 +16321 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2679
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -16396 +16327 @@
 #. 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 +16338 @@
 #. 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 +16349 @@
 #. 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 +16360 @@
 #. 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 +16432 @@
 #. <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 +16449 @@
 #. <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 +16455 @@
 #. 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 +16474 @@
 #. <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 +16539 @@
 #. <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 +16611 @@
 #. 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 +16622 @@
 #. 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 +16643 @@
 #. 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 +16649 @@
 #. 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 +16665 @@
 #. 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 +16675 @@
 #. 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 +16715 @@
 #. 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 +16789 @@
 #. 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 +16796 @@
 #. </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 +16807 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2969
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -16881 +16814 @@
 #. <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 +16820 @@
 #. 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 +16856 @@
 #. </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 +16872 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2984
 msgid "Route"
 msgstr "Route"
@@ -16946 +16879 @@
 #. <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 +16885 @@
 #. 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 +16955 @@
 #. <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 +17017 @@
 #. <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 +17027 @@
 #. <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 +17054 @@
 #. <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 +17065 @@
 #. 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 +17093 @@
 #. </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 +17300 @@
 #. <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 +17416 @@
 #. <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 +17524 @@
 #: 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 +17572 @@
 #. <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 +17823 @@
 #. <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 +17878 @@
 #. <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 +17925 @@
 #. <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 +17956 @@
 #. <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 +17969 @@
 #. <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 +17989 @@
 #. <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 +18016 @@
 #. <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 +18028 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:852
+#: build/trans_style.java:971
 msgid "stream"
 msgstr "stream"
@@ -17831 +18040 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:868
+#: build/trans_style.java:987
 msgid "dock"
 msgstr "dock"
@@ -17857 +18066 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:890
+#: build/trans_style.java:1009
 msgid "aqueduct"
 msgstr "aqueduct"
@@ -17870 +18079 @@
 #. <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 +18117 @@
 #. <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 +18232 @@
 #. <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 +18284 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color viaduct
+#. color deprecated
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
@@ -18089 +18300 @@
 #. <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 +18323 @@
 #. <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 +18356 @@
 #. <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 +18400 @@
 #. <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 +18413 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1130
+#: build/trans_style.java:1259
 msgid "terminal"
 msgstr "terminal"
@@ -18222 +18433 @@
 #. <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 +18445 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1162
+#: build/trans_style.java:1291
 msgid "aeroway_light"
 msgstr "aeroway_light"
@@ -18255 +18466 @@
 #.
 #. <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 +18491 @@
 #. <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 +18503 @@
 #. </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 +18520 @@
 #. <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 +18533 @@
 #. <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 +18545 @@
 #.
 #. <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 +18573 @@
 #. <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 +18603 @@
 #.
 #. <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 +18643 @@
 #.
 #. <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 +18677 @@
 #. <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 +18693 @@
 #. <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 +18708 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1362
+#: build/trans_style.java:1540
 msgid "pipeline"
 msgstr "pipeline"
@@ -18567 +18834 @@
 #. <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 +18853 @@
 #. <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 +18923 @@
 #. <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 +18960 @@
 #.
 #. <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 +19025 @@
 #. <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 +19168 @@
 #.
 #. <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 +19415 @@
 #. <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 +19462 @@
 #. <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 +19497 @@
 #.
 #. <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 +19522 @@
 #. <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 +19617 @@
 #.
 #. <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 +19825 @@
 #.
 #. <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 +19872 @@
 #. </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 +19949 @@
 #.
 #. <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 +19967 @@
 #. <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 +20023 @@
 #. <icon annotate="true" src="service/arts_centre.png"/>
 #. color tourism
+#. color tourism
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -19778 +20118 @@
 #. <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 +20192 @@
 #. <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 +20263 @@
 #.
 #. <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 +20279 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:2781
+#: build/trans_style.java:3029
 msgid "quarry"
 msgstr "quarry"
@@ -19951 +20291 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:2789
+#: build/trans_style.java:3037
 msgid "landfill"
 msgstr "landfill"
@@ -19971 +20311 @@
 #. <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 +20323 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:2813
+#: build/trans_style.java:3061
 msgid "forest"
 msgstr "forest"
@@ -19995 +20335 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:2845
+#: build/trans_style.java:3093
 msgid "farmyard"
 msgstr "farmyard"
@@ -20016 +20356 @@
 #. <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 +20368 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:2870
+#: build/trans_style.java:3118
 msgid "industrial"
 msgstr "industrial"
@@ -20040 +20380 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:2878
+#: build/trans_style.java:3126
 msgid "brownfield"
 msgstr "brownfield"
@@ -20052 +20392 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:2886
+#: build/trans_style.java:3134
 msgid "greenfield"
 msgstr "greenfield"
@@ -20064 +20404 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:2894
+#: build/trans_style.java:3142
 msgid "railland"
 msgstr "railland"
@@ -20119 +20459 @@
 #. <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 +20473 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:2919
+#: build/trans_style.java:3167
 msgid "cemetery"
 msgstr "cemetery"
@@ -20144 +20484 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:2995
+#: build/trans_style.java:3243
 msgid "peak"
 msgstr "peak"
@@ -20157 +20497 @@
 #. <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 +20509 @@
 #. <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 +20522 @@
 #. <icon src="misc/no_icon.png"/>
 #. color natural
+#. color natural
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20221 +20562 @@
 #. <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 +20577 @@
 #. <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 +20589 @@
 #. <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 +20601 @@
 #. <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 +20613 @@
 #. <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 +20625 @@
 #. <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 +20701 @@
 #. <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 +20750 @@
 #. <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 +20892 @@
 #. <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 +20936 @@
 #. <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 +21224 @@
 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"